diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt
index 66b9b5049c8..a3bc7288c6d 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt
@@ -110,6 +110,12 @@ public class TypeResolver(
         val type = resolveTypeElement(c, annotations, typeElement)
         c.trace.record(BindingContext.TYPE_RESOLUTION_SCOPE, typeReference, c.scope)
 
+        if (!type.isBare) {
+            for (argument in type.actualType.arguments) {
+                ForceResolveUtil.forceResolveAllContents(argument.type)
+            }
+        }
+
         return type
     }
 
@@ -252,12 +258,6 @@ public class TypeResolver(
             }
         })
 
-        if (result != null && !result!!.isBare) {
-            for (argument in result!!.actualType.arguments) {
-                ForceResolveUtil.forceResolveAllContents(argument.type)
-            }
-        }
-
         return result ?: type(ErrorUtils.createErrorType(typeElement?.getDebugText() ?: "No type element"))
     }