diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
index 667a0137566..b011341e4fa 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
@@ -351,7 +351,7 @@ public class DeclarationResolver {
     }
 
     private void checkRedeclarationsInNamespaces() {
-        for (NamespaceDescriptorImpl descriptor : context.getNamespaceDescriptors().values()) {
+        for (NamespaceDescriptorImpl descriptor : Sets.newHashSet(context.getNamespaceDescriptors().values())) {
             Multimap<Name, DeclarationDescriptor> simpleNameDescriptors = descriptor.getMemberScope().getDeclaredDescriptorsAccessibleBySimpleName();
             for (Name name : simpleNameDescriptors.keySet()) {
                 // Keep only properties with no receiver
diff --git a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.kt b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.kt
new file mode 100644
index 00000000000..8808a9155ac
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.kt
@@ -0,0 +1,5 @@
+// FILE: a.kt
+val <!REDECLARATION, REDECLARATION!>a<!> : Int = 1
+
+// FILE: b.kt
+val <!REDECLARATION, REDECLARATION!>a<!> : Int = 1
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
index e7543974045..496294ada24 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -4650,6 +4650,11 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
                 doTest("compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.kt");
             }
             
+            @TestMetadata("RedeclarationInMultiFile.kt")
+            public void testRedeclarationInMultiFile() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.kt");
+            }
+            
             @TestMetadata("Redeclarations.kt")
             public void testRedeclarations() throws Exception {
                 doTest("compiler/testData/diagnostics/tests/redeclarations/Redeclarations.kt");