diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt
index 9158f3e81d1..3f85fb5f24c 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt
+++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt
@@ -105,7 +105,8 @@ class DeserializationContextWithTypes(
     ): DeserializationContextWithTypes {
         val childTypeParameterResolver = object : TypeDeserializer.TypeParameterResolver {
             override fun getTypeParameters(typeDeserializer: TypeDeserializer): List<DeserializedTypeParameterDescriptor> {
-                val descriptors = deserializer.typeParameters(typeParameterProtos, typeDeserializer)
+                val childDeserializer = MemberDeserializer(withTypes(descriptor, typeDeserializer))
+                val descriptors = childDeserializer.typeParameters(typeParameterProtos, typeDeserializer)
                 typeParameters.addAll(descriptors)
                 return descriptors
             }