diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolveData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolveData.java
index 6a183a9aa0d..16a22bc6dd0 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolveData.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolveData.java
@@ -147,14 +147,11 @@ class JavaDescriptorResolveData {
 
         private final ClassDescriptorFromJvmBytecode classDescriptor;
 
-        List<JavaDescriptorSignatureResolver.TypeParameterDescriptorInitialization> typeParameters;
-
         protected ResolverClassData(boolean negative) {
             super(negative);
             this.classDescriptor = null;
         }
 
-
         protected ResolverClassData(
                 @Nullable PsiClass psiClass,
                 @Nullable PsiPackage psiPackage,
@@ -166,6 +163,7 @@ class JavaDescriptorResolveData {
             classDescriptor = descriptor;
         }
 
+
         public ClassDescriptorFromJvmBytecode getClassDescriptor() {
             return classDescriptor;
         }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
index e2847b4dc8f..cb88defa36b 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
@@ -239,10 +239,11 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
 
         List<JetType> supertypes = new ArrayList<JetType>();
 
-        classData.typeParameters = javaDescriptorSignatureResolver.createUninitializedClassTypeParameters(psiClass, classData);
+        List<JavaDescriptorSignatureResolver.TypeParameterDescriptorInitialization> typeParameterDescriptorInitializations
+                = javaDescriptorSignatureResolver.createUninitializedClassTypeParameters(psiClass, classData);
         
         List<TypeParameterDescriptor> typeParameters = new ArrayList<TypeParameterDescriptor>();
-        for (JavaDescriptorSignatureResolver.TypeParameterDescriptorInitialization typeParameter : classData.typeParameters) {
+        for (JavaDescriptorSignatureResolver.TypeParameterDescriptorInitialization typeParameter : typeParameterDescriptorInitializations) {
             typeParameters.add(typeParameter.descriptor);
         }
         
@@ -262,7 +263,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
         classData.getClassDescriptor().createTypeConstructor();
         classData.getClassDescriptor().setScopeForMemberLookup(new JavaClassMembersScope(semanticServices, classData));
 
-        javaDescriptorSignatureResolver.initializeTypeParameters(classData.typeParameters, classData.getClassDescriptor(), "class " + qualifiedName);
+        javaDescriptorSignatureResolver.initializeTypeParameters(typeParameterDescriptorInitializations, classData.getClassDescriptor(), "class " + qualifiedName);
 
         // TODO: ugly hack: tests crash if initializeTypeParameters called with class containing proper supertypes
         supertypes.addAll(getSupertypes(new PsiClassWrapper(psiClass), classData, classData.getTypeParameters()));