diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorLoader.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorLoader.java
index 5e7e3adbdfb..3bb1d99d23b 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorLoader.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorLoader.java
@@ -56,7 +56,11 @@ public class AnnotationDescriptorLoader extends BaseDescriptorLoader implements
 
     @NotNull
     @Override
-    public List<AnnotationDescriptor> loadClassAnnotations(@NotNull ClassDescriptor descriptor, @NotNull ProtoBuf.Class classProto) {
+    public List<AnnotationDescriptor> loadClassAnnotations(
+            @NotNull ClassDescriptor descriptor,
+            @NotNull ProtoBuf.Class classProto,
+            @NotNull NameResolver nameResolver
+    ) {
         KotlinJvmBinaryClass kotlinClass = findKotlinClassByDescriptor(descriptor);
         if (kotlinClass == null) {
             // This means that the resource we're constructing the descriptor from is no longer present: KotlinClassFinder had found the
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotationLoader.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotationLoader.java
index 91f8dc22151..5471633c9ad 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotationLoader.java
+++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotationLoader.java
@@ -29,7 +29,11 @@ public interface AnnotationLoader {
     AnnotationLoader UNSUPPORTED = new AnnotationLoader() {
         @NotNull
         @Override
-        public List<AnnotationDescriptor> loadClassAnnotations(@NotNull ClassDescriptor descriptor, @NotNull ProtoBuf.Class classProto) {
+        public List<AnnotationDescriptor> loadClassAnnotations(
+                @NotNull ClassDescriptor descriptor,
+                @NotNull ProtoBuf.Class classProto,
+                @NotNull NameResolver nameResolver
+        ) {
             return notSupported();
         }
 
@@ -63,7 +67,11 @@ public interface AnnotationLoader {
     };
 
     @NotNull
-    List<AnnotationDescriptor> loadClassAnnotations(@NotNull ClassDescriptor descriptor, @NotNull ProtoBuf.Class classProto);
+    List<AnnotationDescriptor> loadClassAnnotations(
+            @NotNull ClassDescriptor descriptor,
+            @NotNull ProtoBuf.Class classProto,
+            @NotNull NameResolver nameResolver
+    );
 
     @NotNull
     List<AnnotationDescriptor> loadCallableAnnotations(
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.kt b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.kt
index 403fc637f0c..0fc3b0c82b6 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.kt
+++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.kt
@@ -70,7 +70,7 @@ public class DeserializedClassDescriptor(
                 Annotations.EMPTY
             }
             else DeserializedAnnotations(c.storageManager) {
-                c.components.annotationLoader.loadClassAnnotations(this, classProto)
+                c.components.annotationLoader.loadClassAnnotations(this, classProto, c.nameResolver)
             }
 
     override fun getContainingDeclaration(): DeclarationDescriptor = containingDeclaration