diff --git a/idea/src/org/jetbrains/jet/lang/descriptors/ClassModifiers.java b/idea/src/org/jetbrains/jet/lang/descriptors/ClassModifiers.java
index 6a709ed0eea..896958e0864 100644
--- a/idea/src/org/jetbrains/jet/lang/descriptors/ClassModifiers.java
+++ b/idea/src/org/jetbrains/jet/lang/descriptors/ClassModifiers.java
@@ -29,10 +29,12 @@ public class ClassModifiers extends Modifiers {
 
     public static ClassModifiers resolveModifiers(@Nullable JetModifierList modifierList) {
         if (modifierList == null) return DEFAULT_MODIFIERS;
+        boolean abstractModifier = modifierList.hasModifier(JetTokens.ABSTRACT_KEYWORD);
+        boolean traitModifier = modifierList.hasModifier(JetTokens.TRAIT_KEYWORD);
         return new ClassModifiers(
-                modifierList.hasModifier(JetTokens.ABSTRACT_KEYWORD) || modifierList.hasModifier(JetTokens.TRAIT_KEYWORD),
-                modifierList.hasModifier(JetTokens.OPEN_KEYWORD) || modifierList.hasModifier(JetTokens.ABSTRACT_KEYWORD) || modifierList.hasModifier(JetTokens.TRAIT_KEYWORD),
-                modifierList.hasModifier(JetTokens.TRAIT_KEYWORD)
+                abstractModifier || traitModifier,
+                modifierList.hasModifier(JetTokens.OPEN_KEYWORD) || abstractModifier || traitModifier,
+                traitModifier
         );
     }