diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt
index 5b74df0c892..0aa47ba209e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt
@@ -137,24 +137,28 @@ public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor<Kotlin
             val fqName = descriptor.importableFqName ?: continue
             if (!descriptor.canBeReferencedViaImport()) continue
 
-            val kind = when (descriptor.getImportableDescriptor()) {
-                is ClassDescriptor ->
-                    KotlinReferenceData.Kind.CLASS
-
-                is PackageViewDescriptor ->
-                    KotlinReferenceData.Kind.PACKAGE
-
-                is CallableDescriptor ->
-                    if (descriptor.isExtension) KotlinReferenceData.Kind.EXTENSION_CALLABLE else KotlinReferenceData.Kind.NON_EXTENSION_CALLABLE
-
-                else ->
-                    continue
-            }
+            val kind = referenceDataKind(descriptor) ?: continue
             collectedData.add(KotlinReferenceData(element.range.start - startOffset, element.range.end - startOffset, fqName.asString(), kind))
         }
         return collectedData
     }
 
+    private fun referenceDataKind(descriptor: DeclarationDescriptor): KotlinReferenceData.Kind? {
+        return when (descriptor.getImportableDescriptor()) {
+            is ClassDescriptor ->
+                KotlinReferenceData.Kind.CLASS
+
+            is PackageViewDescriptor ->
+                KotlinReferenceData.Kind.PACKAGE
+
+            is CallableDescriptor ->
+                if (descriptor.isExtension) KotlinReferenceData.Kind.EXTENSION_CALLABLE else KotlinReferenceData.Kind.NON_EXTENSION_CALLABLE
+
+            else ->
+                null
+        }
+    }
+
     private data class ReferenceToRestoreData(
             val reference: JetReference,
             val refData: KotlinReferenceData
@@ -232,10 +236,13 @@ public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor<Kotlin
             LOG.error("Failed to analyze reference (${element.getText()}) after copy paste", e)
             return null
         }
-        val referencedFqNames = referencedDescriptors.filterNot { ErrorUtils.isError(it) }.map { it.importableFqName }.filterNotNull()
+        val referencedFqNames = referencedDescriptors
+                .filterNot { ErrorUtils.isError(it) }
+                .map { it.importableFqName }
+                .filterNotNull()
         val originalFqName = FqName(refData.fqName)
         val referencesSame = referencedFqNames.any { it == originalFqName }
-        val conflict = referencedFqNames.any { it != originalFqName && it.shortName() == originalFqName.shortName() }
+        val conflict = referencedFqNames.any { it != originalFqName }
         if (referencesSame && !conflict) return null
         return ReferenceToRestoreData(reference, refData)
     }
@@ -259,6 +266,7 @@ public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor<Kotlin
                 bindingRequests.add(BindingRequest(pointer, fqName))
             }
 
+            //TODO: this may sometimes cause insertion of redundant imports (see 3 ignored tests)
             if (refData.kind == KotlinReferenceData.Kind.NON_EXTENSION_CALLABLE || refData.kind == KotlinReferenceData.Kind.EXTENSION_CALLABLE) {
                 descriptorsToImport.addIfNotNull(findCallableToImport(fqName, file))
             }
diff --git a/idea/testData/copyPaste/imports/ClassResolvedToPackage.kt b/idea/testData/copyPaste/imports/ClassResolvedToPackage.kt
index 38c4e82a1d3..c32a516a7e8 100644
--- a/idea/testData/copyPaste/imports/ClassResolvedToPackage.kt
+++ b/idea/testData/copyPaste/imports/ClassResolvedToPackage.kt
@@ -1,6 +1,5 @@
 package a
 
-//NOTE: this case can be improved by using shorten reference after importing
 class a {
     class object {
     }