diff --git a/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java b/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java
index 334feb7f5a21..1948ff4d95ab 100644
--- a/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java
+++ b/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java
@@ -476,9 +476,10 @@ public class PsiUtilCore {
     final PsiElement element = originalFile.findElementAt(range.getStartOffset());
     final int maxLength = range.getLength();
     T parent = PsiTreeUtil.getParentOfType(element, elementClass, false);
-    for (T next = parent ;
-         next != null && next.getTextLength() <= maxLength;
-         parent = next, next = PsiTreeUtil.getParentOfType(next, elementClass, true)) {
+    T next = parent ;
+    while (next != null && next.getTextLength() <= maxLength) {
+      parent = next;
+      next = PsiTreeUtil.getParentOfType(next, elementClass, true);
     }
     return parent;
   }