diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/CompositeElement.java b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/CompositeElement.java
index 8783791a4a6c..eef91964e93e 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/CompositeElement.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/CompositeElement.java
@@ -513,10 +513,14 @@ public class CompositeElement extends TreeElement {
       wrapper = myWrapper;
       if (wrapper != null) return wrapper;
 
-      return myWrapper = createPsiNoLock();
+      return getPsiNoLock();
     }
   }
 
+  final PsiElement getPsiNoLock() {
+    return myWrapper = createPsiNoLock();
+  }
+
   protected PsiElement createPsiNoLock() {
     final Language lang = getElementType().getLanguage();
     final ParserDefinition parserDefinition = LanguageParserDefinitions.INSTANCE.forLanguage(lang);
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/LazyParseableElement.java b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/LazyParseableElement.java
index c77d34a7af46..5d391508b997 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/LazyParseableElement.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/LazyParseableElement.java
@@ -36,7 +36,7 @@ public class LazyParseableElement extends CompositeElement {
 
     @Override
     public void visitComposite(CompositeElement composite) {
-      composite.createPsiNoLock();
+      composite.getPsiNoLock();
       super.visitComposite(composite);
     }