diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/PsiAnnotationWithFlags.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/PsiAnnotationWithFlags.java
index 6bbe670a936..557991b935a 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/PsiAnnotationWithFlags.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/PsiAnnotationWithFlags.java
@@ -25,18 +25,20 @@ import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
  * @since 6/14/12
  */
 public abstract class PsiAnnotationWithFlags extends PsiAnnotationWrapper {
+    private int flags;
+
     protected PsiAnnotationWithFlags(@Nullable PsiAnnotation psiAnnotation) {
         super(psiAnnotation);
     }
 
     @Override
     protected void initialize() {
-        initialized = getIntAttribute(JvmStdlibNames.JET_FLAGS_FIELD, JvmStdlibNames.FLAGS_DEFAULT_VALUE);
+        flags = getIntAttribute(JvmStdlibNames.JET_FLAGS_FIELD, JvmStdlibNames.FLAGS_DEFAULT_VALUE);
     }
 
     public final int flags() {
         checkInitialized();
-        return initialized;
+        return flags;
     }
 
     public final boolean hasPropertyFlag() {
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/PsiAnnotationWrapper.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/PsiAnnotationWrapper.java
index 16239448842..1a3a44b15ed 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/PsiAnnotationWrapper.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/PsiAnnotationWrapper.java
@@ -28,7 +28,7 @@ public abstract class PsiAnnotationWrapper {
     @Nullable
     private final PsiAnnotation psiAnnotation;
 
-    protected int initialized = -1;
+    private boolean initialized = false;
 
     protected PsiAnnotationWrapper(@Nullable PsiAnnotation psiAnnotation) {
         this.psiAnnotation = psiAnnotation;
@@ -41,9 +41,9 @@ public abstract class PsiAnnotationWrapper {
     protected abstract void initialize();
 
     protected void checkInitialized () {
-        if (initialized == -1) {
-            initialized = 0;
+        if (!initialized) {
             initialize();
+            initialized = true;
         }
     }