diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/ForCanBeForeachInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/ForCanBeForeachInspection.java
index eb42c756cc0b..0e34811b5221 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/ForCanBeForeachInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/ForCanBeForeachInspection.java
@@ -1079,9 +1079,6 @@ public class ForCanBeForeachInspection extends BaseInspection{
             return false;
         }
         final PsiVariable variable = (PsiVariable)declaredElement;
-        if(variable == null){
-            return false;
-        }
         if(!TypeUtils.variableHasTypeOrSubtype(variable,
                 CommonClassNames.JAVA_UTIL_ITERATOR,
                 "java.util.ListIterator")){
@@ -1147,10 +1144,7 @@ public class ForCanBeForeachInspection extends BaseInspection{
         if(calculateCallsToIteratorNext(iteratorName, body) != 1){
             return false;
         }
-        if(isIteratorRemoveCalled(iteratorName, body)){
-            return false;
-        }
-        if(isIteratorHasNextCalled(iteratorName, body)){
+        if(isIteratorMethodCalled(iteratorName, body)){
             return false;
         }
         return !VariableAccessUtils.variableIsReturned(variable, body) &&
@@ -1170,20 +1164,12 @@ public class ForCanBeForeachInspection extends BaseInspection{
         return visitor.getNumCallsToIteratorNext();
     }
 
-    private static boolean isIteratorRemoveCalled(String iteratorName,
+    private static boolean isIteratorMethodCalled(String iteratorName,
                                                   PsiStatement body){
-        final IteratorRemoveVisitor visitor =
-                new IteratorRemoveVisitor(iteratorName);
+        final IteratorMethodCallVisitor visitor =
+                new IteratorMethodCallVisitor(iteratorName);
         body.accept(visitor);
-        return visitor.isRemoveCalled();
-    }
-
-    private static boolean isIteratorHasNextCalled(String iteratorName,
-                                                   PsiStatement body){
-        final IteratorHasNextVisitor visitor =
-                new IteratorHasNextVisitor(iteratorName);
-        body.accept(visitor);
-        return visitor.isHasNextCalled();
+        return visitor.isMethodCalled();
     }
 
     private static boolean isHasNext(PsiExpression condition, String iterator){
@@ -1428,31 +1414,31 @@ public class ForCanBeForeachInspection extends BaseInspection{
         }
     }
 
-    private static class IteratorRemoveVisitor
+    private static class IteratorMethodCallVisitor
             extends JavaRecursiveElementVisitor{
-        private boolean removeCalled = false;
+        private boolean methodCalled = false;
         private final String iteratorName;
 
-        IteratorRemoveVisitor(String iteratorName){
+        IteratorMethodCallVisitor(String iteratorName){
             this.iteratorName = iteratorName;
         }
 
         @Override public void visitElement(@NotNull PsiElement element){
-            if(!removeCalled){
+            if(!methodCalled){
                 super.visitElement(element);
             }
         }
 
         @Override public void visitMethodCallExpression(
                 @NotNull PsiMethodCallExpression expression){
-            if(removeCalled){
+            if(methodCalled){
                 return;
             }
             super.visitMethodCallExpression(expression);
             final PsiReferenceExpression methodExpression =
                     expression.getMethodExpression();
             final String name = methodExpression.getReferenceName();
-            if(!HardcodedMethodConstants.REMOVE.equals(name)){
+            if(HardcodedMethodConstants.NEXT.equals(name)){
                 return;
             }
             final PsiExpression qualifier =
@@ -1460,56 +1446,13 @@ public class ForCanBeForeachInspection extends BaseInspection{
             if(qualifier != null){
                 final String qualifierText = qualifier.getText();
                 if(iteratorName.equals(qualifierText)){
-                    removeCalled = true;
+                    methodCalled = true;
                 }
             }
         }
 
-        public boolean isRemoveCalled(){
-            return removeCalled;
-        }
-    }
-
-    private static class IteratorHasNextVisitor
-            extends JavaRecursiveElementVisitor{
-
-        private boolean hasNextCalled = false;
-        private final String iteratorName;
-
-        IteratorHasNextVisitor(String iteratorName){
-            this.iteratorName = iteratorName;
-        }
-
-        @Override public void visitElement(@NotNull PsiElement element){
-            if(!hasNextCalled){
-                super.visitElement(element);
-            }
-        }
-
-        @Override public void visitMethodCallExpression(
-                @NotNull PsiMethodCallExpression expression){
-            if(hasNextCalled){
-                return;
-            }
-            super.visitMethodCallExpression(expression);
-            final PsiReferenceExpression methodExpression =
-                    expression.getMethodExpression();
-            final String name = methodExpression.getReferenceName();
-            if(!HardcodedMethodConstants.HAS_NEXT.equals(name)){
-                return;
-            }
-            final PsiExpression qualifier =
-                    methodExpression.getQualifierExpression();
-            if(qualifier != null){
-                final String qualifierText = qualifier.getText();
-                if(iteratorName.equals(qualifierText)){
-                    hasNextCalled = true;
-                }
-            }
-        }
-
-        public boolean isHasNextCalled(){
-            return hasNextCalled;
+        public boolean isMethodCalled(){
+            return methodCalled;
         }
     }
 
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/foreach/ForCanBeForEach.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/foreach/ForCanBeForEach.java
index f0cccddf731f..9a9179db8203 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/foreach/ForCanBeForEach.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/foreach/ForCanBeForEach.java
@@ -226,4 +226,12 @@ public class ForCanBeForEach {
             System.out.println(intList.get(i));
         }
     }
+
+    void listIteration(List<String> l) {
+        for (Iterator<String> i = l.listIterator(); l.hasNext(); ) {
+            if ("sit".equals(l.next())) {
+                i.set("stay");
+            }
+        }
+    }
 }
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/migration/ForCanBeForeachInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/migration/ForCanBeForeachInspectionTest.java
index cc2e8feadf7b..20de52ea22af 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/migration/ForCanBeForeachInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/migration/ForCanBeForeachInspectionTest.java
@@ -6,6 +6,7 @@ import com.intellij.codeInspection.ex.LocalInspectionToolWrapper;
 public class ForCanBeForeachInspectionTest extends IGInspectionTestCase {
 
     public void test() throws Exception {
-        doTest("com/siyeh/igtest/migration/foreach", new LocalInspectionToolWrapper(new ForCanBeForeachInspection()), "java 1.5");
+        doTest("com/siyeh/igtest/migration/foreach",
+               new LocalInspectionToolWrapper(new ForCanBeForeachInspection()), "java 1.5");
     }
 }
\ No newline at end of file