diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrModifierListImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrModifierListImpl.java
index 5190d985fa18..d065ad080cca 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrModifierListImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrModifierListImpl.java
@@ -337,10 +337,10 @@ public class GrModifierListImpl extends GrStubElementBase<GrModifierListStub> im
       final ASTNode node = annotation.getNode();
       final ASTNode treeNext = node.getTreeNext();
       if (treeNext != null) {
-        getNode().addLeaf(GroovyTokenTypes.mNLS, "\n", treeNext);
+        getNode().addLeaf(TokenType.WHITE_SPACE, "\n", treeNext);
       }
       else {
-        parent.getNode().addLeaf(GroovyTokenTypes.mNLS, "\n", getNode().getTreeNext());
+        parent.getNode().addLeaf(TokenType.WHITE_SPACE, "\n", getNode().getTreeNext());
       }
     }
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java
index efb3b1c947fa..70dc3a058225 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java
@@ -701,15 +701,7 @@ public abstract class GrTypeDefinitionImpl extends GrStubElementBase<GrTypeDefin
       return super.addBefore(element, anchor);
     }
 
-    ASTNode node = element.getNode();
-    assert node != null;
-    final ASTNode bodyNode = body.getNode();
-    final ASTNode anchorNode = anchor.getNode();
-    bodyNode.addChild(node, anchorNode);
-    bodyNode.addLeaf(GroovyTokenTypes.mWS, " ", node);
-    bodyNode.addLeaf(GroovyTokenTypes.mNLS, "\n", anchorNode);
-
-    return element;
+    return body.addBefore(element, anchor);
   }
 
   public PsiElement add(@NotNull PsiElement psiElement) throws IncorrectOperationException {