diff --git a/idea/testData/libraries/decompiled/namespace.kt b/idea/testData/libraries/decompiled/namespace.kt
index 244948982ec..4c1b1e90278 100644
--- a/idea/testData/libraries/decompiled/namespace.kt
+++ b/idea/testData/libraries/decompiled/namespace.kt
@@ -23,4 +23,8 @@ package testData.libraries
 
 [public fun main(args : jet.Array<jet.String>) : Unit { /* compiled code */ }]
 
+[public fun processDouble(d : jet.Double) : Unit { /* compiled code */ }]
+
+[public fun processDouble(d : testData.libraries.Double) : Unit { /* compiled code */ }]
+
 [public fun <T> T.filter(predicate : (T) -> jet.Boolean) : T? { /* compiled code */ }]
\ No newline at end of file
diff --git a/idea/testData/libraries/library/main.kt b/idea/testData/libraries/library/main.kt
index 773b7ff30f7..88ecdee6f93 100644
--- a/idea/testData/libraries/library/main.kt
+++ b/idea/testData/libraries/library/main.kt
@@ -100,3 +100,10 @@ public fun func() {
 }
 
 public inline fun <T> T.filter(predicate: (T)-> Boolean) : T? = this
+
+
+public class Double
+
+public fun processDouble(d: Double) {}
+
+public fun processDouble(d: jet.Double) {}
\ No newline at end of file
diff --git a/idea/testData/libraries/usercode/TypeWithSameShortName.kt b/idea/testData/libraries/usercode/TypeWithSameShortName.kt
new file mode 100644
index 00000000000..24973bc93f8
--- /dev/null
+++ b/idea/testData/libraries/usercode/TypeWithSameShortName.kt
@@ -0,0 +1,13 @@
+import testData.libraries.*
+
+fun foo() {
+    processDouble(1.0);
+    processDouble(Double())
+}
+
+// main.kt
+//public class <3>Double
+//
+//public fun <2>processDouble(d: Double) {}
+//
+//public fun <1>processDouble(d: jet.Double) {}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToLibrarySourceTest.java b/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToLibrarySourceTest.java
index 5ace0b41a1c..4a967a0f980 100644
--- a/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToLibrarySourceTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToLibrarySourceTest.java
@@ -80,6 +80,10 @@ public class NavigateToLibrarySourceTest extends AbstractNavigateToLibraryTest {
         doTest();
     }
 
+    public void testTypeWithSameShortName() {
+        doTest();
+    }
+
     private void doTest() {
         userFile = LocalFileSystem.getInstance().findFileByPath(TEST_DATA_PATH + "/usercode/" + getTestName(false) + ".kt");
         assertNotNull(userFile);