diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirStandardOverrideChecker.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirStandardOverrideChecker.kt
index 4657c3cb79a..ff39ae284ad 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirStandardOverrideChecker.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirStandardOverrideChecker.kt
@@ -31,7 +31,7 @@ class FirStandardOverrideChecker(session: FirSession) : FirAbstractOverrideCheck
             val baseIsFlexible = substitutedBaseType.isFlexible()
             val candidateIsFlexible = substitutedCandidateType.isFlexible()
             if (baseIsFlexible == candidateIsFlexible) {
-                return strictEqualTypes(context, substitutedCandidateType, substitutedBaseType)
+                return AbstractTypeChecker.equalTypes(context, substitutedCandidateType, substitutedBaseType)
             }
             val lowerBound: SimpleTypeMarker
             val upperBound: SimpleTypeMarker
diff --git a/compiler/fir/resolve/testData/resolve/problems/definitelyNotNullAmbiguity.kt b/compiler/fir/resolve/testData/resolve/problems/definitelyNotNullAmbiguity.kt
index ba1c866c375..d6da92dc532 100644
--- a/compiler/fir/resolve/testData/resolve/problems/definitelyNotNullAmbiguity.kt
+++ b/compiler/fir/resolve/testData/resolve/problems/definitelyNotNullAmbiguity.kt
@@ -17,5 +17,5 @@ interface B : A {
 // FILE: main.kt
 
 fun test(visitor: KtVisitor<String, Unit>, element: B) {
-    element.<!AMBIGUITY!>accept<!>(visitor, Unit)
+    element.accept(visitor, Unit)
 }
diff --git a/compiler/fir/resolve/testData/resolve/problems/definitelyNotNullAmbiguity.txt b/compiler/fir/resolve/testData/resolve/problems/definitelyNotNullAmbiguity.txt
index 73d0a1d33d9..e3322277bf9 100644
--- a/compiler/fir/resolve/testData/resolve/problems/definitelyNotNullAmbiguity.txt
+++ b/compiler/fir/resolve/testData/resolve/problems/definitelyNotNullAmbiguity.txt
@@ -5,5 +5,5 @@ FILE: B.kt
     }
 FILE: main.kt
     public final fun test(visitor: R|KtVisitor<kotlin/String, kotlin/Unit>|, element: R|B|): R|kotlin/Unit| {
-        R|<local>/element|.<Ambiguity: accept, [/B.accept, /A.accept]>#(R|<local>/visitor|, Q|kotlin/Unit|)
+        R|<local>/element|.R|/B.accept|<R|kotlin/String|, R|kotlin/Unit|>(R|<local>/visitor|, Q|kotlin/Unit|)
     }