diff --git a/lib/feature_extractor.js b/lib/feature_extractor.js
index e13c204e..d51b7149 100644
--- a/lib/feature_extractor.js
+++ b/lib/feature_extractor.js
@@ -229,9 +229,13 @@ function generateAstFeatures(toplevel, feature_outputter) {
 
 				feature_outputter.addFeature(
 					nodeToString(node1), 
-					nodeToString(node2), 
-					pathToStringBw(path1, common_prefix_len) + ":" + nodeType(path1[common_prefix_len - 1]) + ":" + pathToStringFw(path2, common_prefix_len)
+					nodeToString(node2),
+					//pathToStringBw(path1, common_prefix_len) + ":" + nodeType(path1[common_prefix_len - 1]) + ":" + pathToStringFw(path2, common_prefix_len)
+					(path2.length != common_prefix_len)
+						? pathToStringBw(path1, common_prefix_len) + ":" + pathToStringFw(path2, common_prefix_len - 1)
+						: pathToStringBw(path2, common_prefix_len) + ":" + pathToStringFw(path1, common_prefix_len - 1)
 				);
+
 			}
 		}
 	});