diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java
index de621ebf5d0..69a1881ee95 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java
@@ -8,6 +8,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.diagnostics.Errors;
 import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.jet.resolve.DescriptorRenderer;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -61,7 +62,7 @@ public class OverloadResolver {
             DeclarationDescriptor containingDeclaration = function.getContainingDeclaration();
             if (containingDeclaration instanceof NamespaceDescriptor) {
                 NamespaceDescriptor namespaceDescriptor = (NamespaceDescriptor) containingDeclaration;
-                functionsByName.putValue(new Key(namespaceDescriptor.getName(), function.getName()), function);
+                functionsByName.putValue(new Key(DescriptorRenderer.getFQName(namespaceDescriptor), function.getName()), function);
             }
         }
 
diff --git a/compiler/testData/checkerWithErrorTypes/quick/ConflictingOverloads.jet b/compiler/testData/checkerWithErrorTypes/quick/ConflictingOverloads.jet
index ab9380427fb..642fe8b6699 100644
--- a/compiler/testData/checkerWithErrorTypes/quick/ConflictingOverloads.jet
+++ b/compiler/testData/checkerWithErrorTypes/quick/ConflictingOverloads.jet
@@ -40,3 +40,9 @@ namespace ns2 {
     fun e() = 1
 }
 
+namespace ns3 {
+    namespace ns1 {
+        fun e() = 1
+    }
+}
+