diff --git a/java/java-impl/src/com/intellij/codeInspection/java18StreamApi/PseudoLambdaReplaceTemplate.java b/java/java-impl/src/com/intellij/codeInspection/java18StreamApi/PseudoLambdaReplaceTemplate.java
index 92566655a237..53d1b2635b28 100644
--- a/java/java-impl/src/com/intellij/codeInspection/java18StreamApi/PseudoLambdaReplaceTemplate.java
+++ b/java/java-impl/src/com/intellij/codeInspection/java18StreamApi/PseudoLambdaReplaceTemplate.java
@@ -290,54 +290,39 @@ class PseudoLambdaReplaceTemplate {
                                            final @Nullable PsiSubstitutor methodSubstitutor,
                                            final PsiElement context) {
     if (type instanceof PsiClassType) {
-      PsiClass targetClass = ((PsiClassType)type).resolve();
-      if (targetClass != null) {
-        //TODO fuu
-        if (targetClass instanceof PsiAnonymousClass) {
-          targetClass = ((PsiAnonymousClass)targetClass).getBaseClassType().resolve();
-          if (targetClass == null) {
+      final PsiClass resolvedClass = ((PsiClassType)type).resolve();
+      if (resolvedClass != null) {
+        if (resolvedClass instanceof PsiAnonymousClass) {
+          final PsiClass baseClass = ((PsiAnonymousClass)resolvedClass).getBaseClassType().resolve();
+          if (baseClass == null) {
             return false;
           }
+          if (!LambdaUtil.isFunctionalClass(baseClass)) {
+            return false;
+          }
+          PsiMethod superMethod = LambdaUtil.getFunctionalInterfaceMethod(baseClass);
+          if (superMethod == null) {
+            return false;
+          }
+          final PsiMethod[] methods = resolvedClass.findMethodsByName(superMethod.getName(), false);
+          PsiMethod method = null;
+          for (PsiMethod m : methods) {
+            if (PsiSuperMethodUtil.isSuperMethod(m, superMethod)) {
+              method = m;
+            }
+          }
+          if (method == null) {
+            return false;
+          }
+          final PsiType psiType = methodSubstitutor == null ? method.getReturnType() : methodSubstitutor.substitute(method.getReturnType());
+          return isSuitableLambdaRole(psiType, baseMethodReturnType, methodSubstitutor, context);
         } else {
-          if (!LambdaUtil.isFunctionalClass(targetClass)) {
+          if (!LambdaUtil.isFunctionalClass(resolvedClass)) {
             return false;
           }
           return isSuitableLambdaRole(LambdaUtil.getFunctionalInterfaceReturnType(type), baseMethodReturnType, methodSubstitutor, context);
         }
-        if (!LambdaUtil.isFunctionalClass(targetClass)) {
-          return false;
         }
-        //TODO fuu
-        PsiMethod method = LambdaUtil.getFunctionalInterfaceMethod(targetClass);
-        final PsiMethod[] methods = ((PsiClassType)type).resolve().findMethodsByName(method.getName(), false);
-        if (methods.length != 1) {
-          return false;
-        }
-        method = methods[0];
-        if (method == null) {
-          return false;
-        }
-        final PsiType psiType;
-        if (type instanceof PsiClassReferenceType) {
-          final PsiJavaCodeReferenceElement reference = ((PsiClassReferenceType)type).getReference();
-          final PsiClass resolvedClass = ((PsiClassReferenceType)type).resolve();
-          final PsiTypeParameter[] typeParameters = resolvedClass.getTypeParameters();
-          final PsiType[] substitutedTypeParameters = reference.getTypeParameters();
-
-          LOG.assertTrue(typeParameters.length == substitutedTypeParameters.length);
-          final Map<PsiTypeParameter, PsiType> substitutionMap = new HashMap<PsiTypeParameter, PsiType>();
-          for (int i = 0; i < typeParameters.length; i++) {
-            PsiTypeParameter parameter = typeParameters[i];
-            PsiType t = substitutedTypeParameters[i];
-            substitutionMap.put(parameter, t);
-          }
-          PsiSubstitutor substitutor = PsiSubstitutorImpl.createSubstitutor(substitutionMap);
-          psiType = substitutor.substitute(method.getReturnType());
-        } else {
-          psiType = method.getReturnType();
-        }
-        return isSuitableLambdaRole(psiType, baseMethodReturnType, methodSubstitutor, context);
-      }
       return false;
     } else {
       return false;
diff --git a/java/java-tests/testData/inspection/lambdaLibsStatic/simpleFind/test.java b/java/java-tests/testData/inspection/lambdaLibsStatic/simpleFind/test.java
index 659f81f7be23..78cff8625ae8 100644
--- a/java/java-tests/testData/inspection/lambdaLibsStatic/simpleFind/test.java
+++ b/java/java-tests/testData/inspection/lambdaLibsStatic/simpleFind/test.java
@@ -6,9 +6,9 @@ import java.util.Collections;
 
 class c {
   void m() {
-    Iterables.f<caret>ind(Collections.emptyList(), new Predicate<Object>() {
+    Iterables.f<caret>ind(Collections.emptyList(), new Predicate<String>() {
       @Override
-      public boolean apply(Object input) {
+      public boolean apply(String input) {
         return true;
       }
     });
diff --git a/java/java-tests/testData/inspection/lambdaLibsStatic/simpleFind/test_after.java b/java/java-tests/testData/inspection/lambdaLibsStatic/simpleFind/test_after.java
index db6dff003227..9e43e688a5c6 100644
--- a/java/java-tests/testData/inspection/lambdaLibsStatic/simpleFind/test_after.java
+++ b/java/java-tests/testData/inspection/lambdaLibsStatic/simpleFind/test_after.java
@@ -6,6 +6,6 @@ import java.util.Collections;
 
 class c {
   void m() {
-    Collections.emptyList().stream().filter(input -> true).findFirst().get();
+    Collections.<String>emptyList().stream().filter(input -> true).findFirst().get();
   }
 }
\ No newline at end of file