diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java
index 53a103f6fd8..903d4357575 100644
--- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java
+++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java
@@ -80,7 +80,7 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements
         this.deserializer = DescriptorDeserializer.create(typeDeserializer, this, nameResolver, annotationResolver);
 
         this.containingDeclaration = containingDeclaration;
-        this.typeConstructor = new DeserializedClassTypeConstructor();
+        this.typeConstructor = new DeserializedClassTypeConstructor(deserializer.typeParameters(classProto.getTypeParametersList()));
         this.memberScope = new DeserializedClassMemberScope(this);
         this.innerClassesScope = new InnerClassesScopeWrapper(memberScope);
         this.thisAsReceiverParameter = new LazyClassReceiverParameterDescriptor();
@@ -276,7 +276,11 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements
 
     private class DeserializedClassTypeConstructor implements TypeConstructor {
         private final Collection<JetType> supertypes = computeSuperTypes();
-        private final List<TypeParameterDescriptor> parameters = deserializer.typeParameters(classProto.getTypeParametersList());
+        private final List<TypeParameterDescriptor> parameters;
+
+        public DeserializedClassTypeConstructor(@NotNull List<TypeParameterDescriptor> typeParameters) {
+            parameters = typeParameters;
+        }
 
         @NotNull
         @Override