diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java
index 2f94edbf74b..1a5a8f8a3bf 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java
@@ -104,11 +104,11 @@ public class TypeResolver {
                         return;
                     }
 
+                    trace.record(BindingContext.REFERENCE_TARGET, referenceExpression, classifierDescriptor);
+
                     if (classifierDescriptor instanceof TypeParameterDescriptor) {
                         TypeParameterDescriptor typeParameterDescriptor = (TypeParameterDescriptor) classifierDescriptor;
 
-                        trace.record(BindingContext.REFERENCE_TARGET, referenceExpression, typeParameterDescriptor);
-
                         JetScope scopeForTypeParameter = getScopeForTypeParameter(typeParameterDescriptor, checkBounds);
                         if (scopeForTypeParameter instanceof ErrorUtils.ErrorScope) {
                             result[0] = ErrorUtils.createErrorType("?");
@@ -133,7 +133,6 @@ public class TypeResolver {
                     else if (classifierDescriptor instanceof ClassDescriptor) {
                         ClassDescriptor classDescriptor = (ClassDescriptor) classifierDescriptor;
 
-                        trace.record(BindingContext.REFERENCE_TARGET, referenceExpression, classifierDescriptor);
                         TypeConstructor typeConstructor = classifierDescriptor.getTypeConstructor();
                         List<TypeProjection> arguments = resolveTypeProjections(scope, typeConstructor, type.getTypeArguments(), trace, checkBounds);
                         List<TypeParameterDescriptor> parameters = typeConstructor.getParameters();