diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyBaseElementImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyBaseElementImpl.java
index c17859059884..1d942e36e7ff 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyBaseElementImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyBaseElementImpl.java
@@ -19,11 +19,11 @@ import com.intellij.extapi.psi.StubBasedPsiElementBase;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiInvalidElementAccessException;
+import com.intellij.psi.impl.CheckUtil;
+import com.intellij.psi.impl.source.SourceTreeToPsiMap;
+import com.intellij.psi.impl.source.tree.ChangeUtil;
 import com.intellij.psi.impl.source.tree.CompositeElement;
 import com.intellij.psi.impl.source.tree.TreeElement;
-import com.intellij.psi.impl.source.tree.ChangeUtil;
-import com.intellij.psi.impl.source.SourceTreeToPsiMap;
-import com.intellij.psi.impl.CheckUtil;
 import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.tree.TokenSet;
@@ -85,10 +85,7 @@ public class GroovyBaseElementImpl<T extends StubElement> extends StubBasedPsiEl
     if (parent == null) {
       throw new PsiInvalidElementAccessException(this);
     }
-    ASTNode parentNode = parent.getNode();
-    ASTNode newNode = newStmt.getNode();
-    parentNode.replaceChild(this.getNode(), newNode);
-    return (T) newNode.getPsi();
+    return (T)replace(newStmt);
   }
 
   public <T extends GroovyPsiElement> Iterable<T> childrenOfType(final TokenSet tokSet) {