diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifierList.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifierList.java
index 8080b8f36f1..57c69778cdb 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifierList.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifierList.java
@@ -77,6 +77,10 @@ public abstract class JetModifierList extends JetElementImplStub<PsiJetModifierL
     }
 
     public boolean hasModifier(JetModifierKeywordToken token) {
+        PsiJetModifierListStub stub = getStub();
+        if (stub != null) {
+            return stub.hasModifier(token);
+        }
         return getModifierNode(token) != null;
     }