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 b58f2a993f0..f3b45d6e857 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java
@@ -92,6 +92,10 @@ public class JetObjectDeclaration extends JetNamedDeclarationStub<PsiJetObjectSt
     }
 
     public boolean isClassObject() {
+        PsiJetObjectStub stub = getStub();
+        if (stub != null) {
+            return stub.isClassObject();
+        }
         PsiElement parent = getParent();
         return parent != null && parent.getNode().getElementType().equals(JetNodeTypes.CLASS_OBJECT);
     }