diff --git a/python/src/com/jetbrains/python/psi/types/PyModuleType.java b/python/src/com/jetbrains/python/psi/types/PyModuleType.java
index fb799d40b2e9..484b600581eb 100644
--- a/python/src/com/jetbrains/python/psi/types/PyModuleType.java
+++ b/python/src/com/jetbrains/python/psi/types/PyModuleType.java
@@ -122,7 +122,9 @@ public class PyModuleType implements PyType { // Modules don't descend from obje
         }
       }, new PyUtil.UnderscoreFilter(0));
       processor.setPlainNamesOnly(point  == ResolveImportUtil.PointInImport.AS_NAME); // no parens after imported function names
-      myModule.processDeclarations(processor, ResolveState.initial(), null, location);
+      for(PyElement element: myModule.iterateNames()) {
+        processor.execute(element, ResolveState.initial());
+      }
       if (names_already != null) {
         for (LookupElement le : processor.getResultList()) {
           String name = le.getLookupString();
diff --git a/python/testData/completion/dunderAll/a.after.py b/python/testData/completion/dunderAll/a.after.py
new file mode 100644
index 000000000000..17014969d31a
--- /dev/null
+++ b/python/testData/completion/dunderAll/a.after.py
@@ -0,0 +1,3 @@
+import importSource
+
+importSource.xyzzy
diff --git a/python/testData/completion/dunderAll/a.py b/python/testData/completion/dunderAll/a.py
new file mode 100644
index 000000000000..8c36604cd4c0
--- /dev/null
+++ b/python/testData/completion/dunderAll/a.py
@@ -0,0 +1,3 @@
+import importSource
+
+importSource.xy<caret>
diff --git a/python/testData/completion/dunderAll/importSource.py b/python/testData/completion/dunderAll/importSource.py
new file mode 100644
index 000000000000..97370355b4c1
--- /dev/null
+++ b/python/testData/completion/dunderAll/importSource.py
@@ -0,0 +1,2 @@
+__all__ = ['xyzzy', 'shazam']
+
diff --git a/python/testSrc/com/jetbrains/python/PythonCompletionTest.java b/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
index 7df1606a11c1..f661b0b8559c 100644
--- a/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
+++ b/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
@@ -487,4 +487,8 @@ public class PythonCompletionTest extends PyTestCase {
   public void testAssignedNearby() {
     doTest();
   }
+  
+  public void testDunderAll() {
+    doMultiFileTest();
+  }
 }