diff --git a/java/java-impl/src/com/intellij/codeInspection/java18api/Java8MapForEachInspection.java b/java/java-impl/src/com/intellij/codeInspection/java18api/Java8MapForEachInspection.java
index f5b15d6a28b4..91b2e197f861 100644
--- a/java/java-impl/src/com/intellij/codeInspection/java18api/Java8MapForEachInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/java18api/Java8MapForEachInspection.java
@@ -191,7 +191,7 @@ public class Java8MapForEachInspection extends BaseJavaBatchLocalInspectionTool
       LambdaRefactoringUtil.simplifyToExpressionLambda(newLambda);
       entrySetCall.getArgumentList().add(newLambda);
       ExpressionUtils.bindCallTo(entrySetCall, "forEach");
-      return entrySetCall.getText();
+      return ct.text(entrySetCall);
     }
 
     private static void fixInForeach(PsiForeachStatement loop) {
diff --git a/java/java-tests/testData/inspection/java8MapForEach/afterForEach.java b/java/java-tests/testData/inspection/java8MapForEach/afterForEach.java
index b2925561df4f..2d69e718fea6 100644
--- a/java/java-tests/testData/inspection/java8MapForEach/afterForEach.java
+++ b/java/java-tests/testData/inspection/java8MapForEach/afterForEach.java
@@ -86,4 +86,10 @@ public class Test {
           System.out.println(str + ":" + num);
       });
   }
+
+  void forEach(Map<String, String> map) {
+      map.forEach((key, value) -> {
+          //long comment
+      });
+  }
 }
diff --git a/java/java-tests/testData/inspection/java8MapForEach/beforeForEach.java b/java/java-tests/testData/inspection/java8MapForEach/beforeForEach.java
index 77a27e10fe2c..3f28804c0384 100644
--- a/java/java-tests/testData/inspection/java8MapForEach/beforeForEach.java
+++ b/java/java-tests/testData/inspection/java8MapForEach/beforeForEach.java
@@ -108,4 +108,10 @@ public class Test {
       System.out.println(str + ":" + num);
     }
   }
+
+  void forEach(Map<String, String> map) {
+    for (Map.Entry<String, String> entry : map.entrySet()) {
+      //long comment
+    }
+  }
 }