diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinAnnotationLightMethod.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinAnnotationLightMethod.kt
new file mode 100644
index 00000000000..00bcf7db0db
--- /dev/null
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinAnnotationLightMethod.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.asJava
+
+import com.intellij.psi.PsiAnnotationMethod
+import com.intellij.psi.PsiClass
+import com.intellij.psi.PsiManager
+import org.jetbrains.kotlin.psi.KtDeclaration
+
+class KotlinAnnotationLightMethod(
+        manager: PsiManager,
+        delegate: PsiAnnotationMethod,
+        origin: KtDeclaration,
+        containingClass: PsiClass
+) : KotlinLightMethodForDeclaration(manager, delegate, origin, containingClass), PsiAnnotationMethod {
+    override fun getDefaultValue() = getDelegate().defaultValue
+
+    override fun getDelegate() = super.getDelegate() as PsiAnnotationMethod
+
+    override fun copy() = KotlinAnnotationLightMethod(manager, getDelegate(), getOrigin(), containingClass!!)
+}
\ No newline at end of file
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java
index 2e877e2d981..4eaeba1d66a 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java
@@ -154,9 +154,16 @@ public abstract class KotlinWrappingLightClass extends AbstractLightClass implem
                 }
 
                 if (declaration != null) {
-                    return !isTraitFakeOverride(declaration) ?
-                           new KotlinLightMethodForDeclaration(myManager, method, declaration, KotlinWrappingLightClass.this) :
-                           new KotlinLightMethodForTraitFakeOverride(myManager, method, declaration, KotlinWrappingLightClass.this);
+                    if (isTraitFakeOverride(declaration)) {
+                        return new KotlinLightMethodForTraitFakeOverride(myManager, method, declaration, KotlinWrappingLightClass.this);
+                    }
+                    else if (method instanceof PsiAnnotationMethod) {
+                        return new KotlinAnnotationLightMethod(myManager, (PsiAnnotationMethod) method, declaration,
+                                                               KotlinWrappingLightClass.this);
+                    }
+                    else {
+                        return new KotlinLightMethodForDeclaration(myManager, method, declaration, KotlinWrappingLightClass.this);
+                    }
                 }
 
                 return new KotlinNoOriginLightMethod(myManager, method, KotlinWrappingLightClass.this);