diff --git a/src/main/java/edu/lu/uni/serval/FixPatternParser/violations/FixedViolationHunkParser.java b/src/main/java/edu/lu/uni/serval/FixPatternParser/violations/FixedViolationHunkParser.java
index b6fdac3..392b10b 100644
--- a/src/main/java/edu/lu/uni/serval/FixPatternParser/violations/FixedViolationHunkParser.java
+++ b/src/main/java/edu/lu/uni/serval/FixPatternParser/violations/FixedViolationHunkParser.java
@@ -69,6 +69,9 @@ public class FixedViolationHunkParser extends FixedViolationParser {
 				int bugEndPosition = 0;
 				int fixEndPosition = 0;
 				for (HierarchicalActionSet hunkActionSet : hunkActionSets) {
+
+
+					//TODO FIX ME
 					int actionBugStart = hunkActionSet.getBugStartLineNum();
 					int actionBugEnd = hunkActionSet.getBugEndLineNum();
 					int actionFixStart = hunkActionSet.getFixStartLineNum();
diff --git a/src/main/java/edu/lu/uni/serval/gumtree/regroup/HierarchicalRegrouperForC.java b/src/main/java/edu/lu/uni/serval/gumtree/regroup/HierarchicalRegrouperForC.java
index 57aa788..34db1c8 100644
--- a/src/main/java/edu/lu/uni/serval/gumtree/regroup/HierarchicalRegrouperForC.java
+++ b/src/main/java/edu/lu/uni/serval/gumtree/regroup/HierarchicalRegrouperForC.java
@@ -241,11 +241,10 @@ public class HierarchicalRegrouperForC {
 	
 	private boolean isStatement(ITree tree) {
 		int nodeType = tree.getType();
-//		if (nodeType == 280002 || nodeType == 280001 || nodeType == 310200 || nodeType == 280100
-//				|| nodeType == 300100 || nodeType == 280003 || nodeType == 310100 || nodeType == 310300
-//				|| 260300 == nodeType || nodeType == 460000) {// TODO
-		if(nodeType == 460000){
-			return true;
+		if (nodeType == 280002 || nodeType == 280001 || nodeType == 310200 || nodeType == 280100
+				|| nodeType == 300100 || nodeType == 280003 || nodeType == 310100 || nodeType == 310300
+				|| 260300 == nodeType || nodeType == 460000) {// TODO
+					return true;
 		}
 		return false;
 	}
diff --git a/src/main/java/edu/lu/uni/serval/gumtree/regroup/HunkActionFilter.java b/src/main/java/edu/lu/uni/serval/gumtree/regroup/HunkActionFilter.java
index fb1aa0b..a9ac36b 100644
--- a/src/main/java/edu/lu/uni/serval/gumtree/regroup/HunkActionFilter.java
+++ b/src/main/java/edu/lu/uni/serval/gumtree/regroup/HunkActionFilter.java
@@ -375,14 +375,14 @@ public class HunkActionFilter {
 			for (HierarchicalActionSet actionSet : actionSets) {
 				String actionStr = actionSet.getActionString();
 				if (actionStr.startsWith("INS")) {
-					int actionFixStartLine = actionSet.getBugStartLineNum();
-					int actionFixEndLine = actionSet.getBugEndLineNum();
+					int actionFixStartLine = actionSet.getStartPosition();
+					int actionFixEndLine = actionSet.getLength();
 					if (fixHunkStartLine <= actionFixEndLine && fixHunkEndLine >= actionFixStartLine ) {
 						diffentryHunk.getActionSets().add(actionSet);
 					}
 				} else {
-					int actionBugStartLine = actionSet.getBugStartLineNum();
-					int actionBugEndLine = actionSet.getBugEndLineNum();
+					int actionBugStartLine = actionSet.getStartPosition();
+					int actionBugEndLine = actionSet.getLength();
 					
 					if (bugHunkStartLine <= actionBugEndLine && bugHunkEndLine >= actionBugStartLine) {
 						diffentryHunk.getActionSets().add(actionSet);