diff --git a/src/main/java/spoon/support/compiler/jdt/ParentExiter.java b/src/main/java/spoon/support/compiler/jdt/ParentExiter.java
index fabd0cf6524..c94264d1919 100644
--- a/src/main/java/spoon/support/compiler/jdt/ParentExiter.java
+++ b/src/main/java/spoon/support/compiler/jdt/ParentExiter.java
@@ -654,14 +654,13 @@ private boolean isContainedInForCondition() {
 
 	@Override
 	public void visitCtForEach(CtForEach foreach) {
-		if (foreach.getVariable() == null && child instanceof CtVariable) {
+		if (foreach.getVariable() == null && child instanceof CtLocalVariable<?>) {
 			foreach.setVariable((CtLocalVariable<?>) child);
-			return;
 		} else if (foreach.getExpression() == null && child instanceof CtExpression) {
 			foreach.setExpression((CtExpression<?>) child);
-			return;
+		} else {
+			super.visitCtForEach(foreach);
 		}
-		super.visitCtForEach(foreach);
 	}
 
 	@Override