diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightPsi.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightPsi.kt
index a03b11b59ce..1abfee01dd7 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightPsi.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightPsi.kt
@@ -616,6 +616,8 @@ internal class KtUltraLightMethod(
         list
     }
 
+    override fun getHierarchicalMethodSignature() = PsiSuperMethodImplUtil.getHierarchicalMethodSignature(this)
+
     override fun getThrowsList(): PsiReferenceList = _throwsList
 }
 
diff --git a/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/OverridesAmbiguity.java b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/OverridesAmbiguity.java
new file mode 100644
index 00000000000..b2b503a4214
--- /dev/null
+++ b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/OverridesAmbiguity.java
@@ -0,0 +1,10 @@
+package test;
+
+class GenericOverrides {
+    public static void main(String[] args) {
+        KotlinClass b = new KotlinClass();
+        b.foo("");
+    }
+}
+
+
diff --git a/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/OverridesAmbiguity.kt b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/OverridesAmbiguity.kt
new file mode 100644
index 00000000000..d977775b20d
--- /dev/null
+++ b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/OverridesAmbiguity.kt
@@ -0,0 +1,10 @@
+// ALLOW_AST_ACCESS
+package test
+
+open class Parent {
+    open fun foo(x: String) {}
+}
+
+open class KotlinClass : Parent() {
+    override fun foo(x: String) {}
+}
diff --git a/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinBinariesCheckerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinBinariesCheckerTestGenerated.java
index 8a2730612cb..293d90533df 100644
--- a/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinBinariesCheckerTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinBinariesCheckerTestGenerated.java
@@ -129,6 +129,11 @@ public class JavaAgainstKotlinBinariesCheckerTestGenerated extends AbstractJavaA
         runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/MyFunctionType.kt");
     }
 
+    @TestMetadata("OverridesAmbiguity.kt")
+    public void testOverridesAmbiguity() throws Exception {
+        runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/OverridesAmbiguity.kt");
+    }
+
     @TestMetadata("ReturnInnerClasses.kt")
     public void testReturnInnerClasses() throws Exception {
         runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt");
diff --git a/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java
index e952eb05047..cfea655a595 100644
--- a/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java
@@ -131,6 +131,11 @@ public class JavaAgainstKotlinSourceCheckerTestGenerated extends AbstractJavaAga
             runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/MyFunctionType.kt");
         }
 
+        @TestMetadata("OverridesAmbiguity.kt")
+        public void testOverridesAmbiguity() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/OverridesAmbiguity.kt");
+        }
+
         @TestMetadata("ReturnInnerClasses.kt")
         public void testReturnInnerClasses() throws Exception {
             runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt");
diff --git a/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerWithUltraLightTestGenerated.java b/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerWithUltraLightTestGenerated.java
index 5b1fc983b38..7fbd7bf750e 100644
--- a/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerWithUltraLightTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerWithUltraLightTestGenerated.java
@@ -131,6 +131,11 @@ public class JavaAgainstKotlinSourceCheckerWithUltraLightTestGenerated extends A
             runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/MyFunctionType.kt");
         }
 
+        @TestMetadata("OverridesAmbiguity.kt")
+        public void testOverridesAmbiguity() throws Exception {
+            runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/OverridesAmbiguity.kt");
+        }
+
         @TestMetadata("ReturnInnerClasses.kt")
         public void testReturnInnerClasses() throws Exception {
             runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt");