diff --git a/src/main/java/gr/uom/java/xmi/decomposition/AbstractCodeMapping.java b/src/main/java/gr/uom/java/xmi/decomposition/AbstractCodeMapping.java
index e97ccc48ba..431c488c01 100644
--- a/src/main/java/gr/uom/java/xmi/decomposition/AbstractCodeMapping.java
+++ b/src/main/java/gr/uom/java/xmi/decomposition/AbstractCodeMapping.java
@@ -148,7 +148,7 @@ private boolean argumentizedStringExactAfterTypeReplacement() {
 		String s2 = fragment2.getArgumentizedString();
 		for(Replacement r : replacements) {
 			if(r.getType().equals(ReplacementType.TYPE)) {
-				if(s1.startsWith(r.getBefore()) && s2.startsWith(r.getAfter())) {
+				if(s1.contains(r.getBefore()) && s2.contains(r.getAfter())) {
 					String temp = s2.replace(r.getAfter(), r.getBefore());
 					if(s1.equals(temp) || (s1 + JAVA.STATEMENT_TERMINATION).equals(temp)) {
 						return true;