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 4a092b33c1..e97ccc48ba 100644
--- a/src/main/java/gr/uom/java/xmi/decomposition/AbstractCodeMapping.java
+++ b/src/main/java/gr/uom/java/xmi/decomposition/AbstractCodeMapping.java
@@ -135,7 +135,8 @@ private boolean callChainMatch() {
 		if(longestCommonSuffix.startsWith(").")) {
 			longestCommonSuffix = longestCommonSuffix.substring(2);
 		}
-		if(longestCommonPrefix.endsWith(".") && !longestCommonSuffix.contains(longestCommonPrefix) &&
+		if(longestCommonPrefix.endsWith(".") && !longestCommonPrefix.contains(JAVA.ASSIGNMENT) && !longestCommonPrefix.startsWith("if(") &&
+				!longestCommonSuffix.startsWith(longestCommonPrefix) &&
 				(s1.equals(longestCommonPrefix + longestCommonSuffix) || s2.equals(longestCommonPrefix + longestCommonSuffix))) {
 			return true;
 		}