diff --git a/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Array.kt b/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Array.kt
new file mode 100644
index 00000000000..0c3cf4f534c
--- /dev/null
+++ b/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Array.kt
@@ -0,0 +1,9 @@
+//KT-1602
+package lib
+
+public class Array {
+}
+
+public trait ArrayFactory {
+    fun create() : Array
+}
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt b/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt
new file mode 100644
index 00000000000..0bf67101c44
--- /dev/null
+++ b/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt
@@ -0,0 +1,6 @@
+//KT-1602
+import lib.ArrayFactory
+
+public class Impl : ArrayFactory {
+    <caret>
+}
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after
new file mode 100644
index 00000000000..4c18e68db61
--- /dev/null
+++ b/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after
@@ -0,0 +1,9 @@
+//KT-1602
+import lib.ArrayFactory
+
+public class Impl : ArrayFactory {
+
+    override fun create() : lib.Array {
+        throw UnsupportedOperationException()
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementTest.java
index 48a0ec1622c..6ee8676eae6 100644
--- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementTest.java
@@ -155,6 +155,10 @@ public class OverrideImplementTest extends LightCodeInsightFixtureTestCase {
         doDirectoryTest(new OverrideMethodsHandler(), memberToImplement);
     }
 
+    public void testSameTypeName() {
+        doDirectoryTest(new OverrideMethodsHandler());
+    }
+
     private void doFileTest(OverrideImplementMethodsHandler handler) {
         myFixture.configureByFile(getTestName(true) + ".kt");
         doOverrideImplement(handler, null);