diff --git a/src/main/java/org/codetracker/BlockTrackerChangeHistory.java b/src/main/java/org/codetracker/BlockTrackerChangeHistory.java
index d2bdf46b362..eb8bd0e3a23 100644
--- a/src/main/java/org/codetracker/BlockTrackerChangeHistory.java
+++ b/src/main/java/org/codetracker/BlockTrackerChangeHistory.java
@@ -173,7 +173,7 @@ else if (mapping instanceof LeafMapping && mapping.getFragment1() instanceof Sta
                         else {
                             VariableDeclarationContainer sourceOperation = extractOperationRefactoring.getSourceOperationBeforeExtraction();
                             Method sourceMethod = Method.of(sourceOperation, parentVersion);
-                            Block leftBlock = Block.of(matchedBlockFromSourceMethod, sourceMethod);
+                            Block leftBlock = Block.of(matchedBlockFromSourceMethod instanceof StatementObject ? (StatementObject) matchedBlockFromSourceMethod : (CompositeStatementObject) matchedBlockFromSourceMethod, sourceMethod);
                             if(extractMatches == 0) {
                             	blocks.add(leftBlock);
                             }