diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/VariableTypeCanBeExplicitInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/VariableTypeCanBeExplicitInspection.java
index ba0472c68dd1..a0a25a56524f 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/VariableTypeCanBeExplicitInspection.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/VariableTypeCanBeExplicitInspection.java
@@ -87,11 +87,10 @@ public class VariableTypeCanBeExplicitInspection extends AbstractBaseJavaLocalIn
                 PsiTypesUtil.replaceWithExplicitType(typeElement);
               }
             }
+            return;
           }
         }
-        else {
-          PsiTypesUtil.replaceWithExplicitType((PsiTypeElement)element);
-        }
+        PsiTypesUtil.replaceWithExplicitType((PsiTypeElement)element);
       }
     }
   }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/var2explicit/afterForeach.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/var2explicit/afterForeach.java
new file mode 100644
index 000000000000..c34c06796e9f
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/var2explicit/afterForeach.java
@@ -0,0 +1,8 @@
+// "Replace 'var' with explicit type" "true"
+final class Example {
+    public static void main(String[] args) {
+        for (String s : args) {
+            System.out.println("s = " + s);
+        }
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/var2explicit/beforeForeach.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/var2explicit/beforeForeach.java
new file mode 100644
index 000000000000..85987df1ebe6
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/var2explicit/beforeForeach.java
@@ -0,0 +1,8 @@
+// "Replace 'var' with explicit type" "true"
+final class Example {
+    public static void main(String[] args) {
+        for (v<caret>ar s : args) {
+            System.out.println("s = " + s);
+        }
+    }
+}
\ No newline at end of file