diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/inference/driver/CommonDriver.kt b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/inference/driver/CommonDriver.kt
index 00587a4b575b..96cad766bf09 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/inference/driver/CommonDriver.kt
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/inference/driver/CommonDriver.kt
@@ -173,7 +173,7 @@ class CommonDriver private constructor(private val targetParameters: Set<GrParam
           if (properType == typeParameter.type()) {
             continue
           }
-          constraintCollector.add(TypeConstraint(resolveResult.substitutor.substitute(type), typeParameter.type(), method))
+          constraintCollector.add(TypeConstraint(properType, typeParameter.type(), method))
         }
       }
     })
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/inference/driver/closure/ClosureInferenceUtil.kt b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/inference/driver/closure/ClosureInferenceUtil.kt
index c4ddd6b8d421..f3647404715f 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/inference/driver/closure/ClosureInferenceUtil.kt
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/inference/driver/closure/ClosureInferenceUtil.kt
@@ -137,14 +137,7 @@ fun collectClosureParamsDependencies(innerParameter: PsiParameter,
   signature ?: return
   for ((inferredType, typeParameter) in signature.zip(closureParameter.typeParameters)) {
     builder.addConstraint(TypeConstraint(typeParameter.type(), inferredType, innerParameter))
-    val inferredTypeParameter = inferredType.typeParameter()
-    if (inferredTypeParameter != null) {
-      builder.addDependentType(typeParameter)
-      builder.addDependentType(inferredTypeParameter)
-    }
-    else {
-      builder.generateRequiredTypes(typeParameter, inferredType, LOWER)
-    }
+    builder.generateRequiredTypes(typeParameter, inferredType, LOWER)
   }
 }