diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java
index acf24479534..44eec626574 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java
@@ -84,11 +84,11 @@ public class JetObjectDeclaration extends JetNamedDeclarationStub<PsiJetObjectSt
     @Nullable
     public JetModifierList getModifierList() {
         if (isClassObject()) {
-            PsiElement parent = getParent();
+            PsiElement parent = getParentByStub();
             assert parent instanceof JetDeclaration;
             return ((JetDeclaration)parent).getModifierList();
         }
-        return (JetModifierList) findChildByType(JetNodeTypes.MODIFIER_LIST);
+        return super.getModifierList();
     }
 
     public boolean isClassObject() {