diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java
index 43a6659ca5a..7e491a442e4 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java
@@ -41,13 +41,17 @@ public class JetTypeConstraint extends JetElementImplStub<PsiJetTypeConstraintSt
     }
 
     public boolean isClassObjectConstraint() {
+        PsiJetTypeConstraintStub stub = getStub();
+        if (stub != null) {
+            return stub.isClassObjectConstraint();
+        }
         return findChildByType(JetTokens.CLASS_KEYWORD) != null &&
                 findChildByType(JetTokens.OBJECT_KEYWORD) != null;
     }
 
     @Nullable @IfNotParsed
     public JetSimpleNameExpression getSubjectTypeParameterName() {
-        return (JetSimpleNameExpression) findChildByType(JetNodeTypes.REFERENCE_EXPRESSION);
+        return getStubOrPsiChild(JetStubElementTypes.REFERENCE_EXPRESSION);
     }
 
     @Nullable @IfNotParsed