diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java b/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java
index 01f3a60aeca..ac023f1884d 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java
@@ -61,10 +61,10 @@ public class DefaultModuleConfiguration implements ModuleConfiguration {
         if (DescriptorUtils.getFQName(namespaceDescriptor).equalsTo(JetStandardClasses.STANDARD_CLASSES_FQNAME)) {
             switch (builtinsScopeExtensionMode) {
                 case ALL:
-                    namespaceMemberScope.importScope(JetStandardClasses.STANDARD_CLASSES);
+                    namespaceMemberScope.importScope(JetStandardLibrary.getInstance().getLibraryScope());
                     break;
                 case ONLY_STANDARD_CLASSES:
-                    namespaceMemberScope.importScope(JetStandardLibrary.getInstance().getLibraryScope());
+                    namespaceMemberScope.importScope(JetStandardClasses.STANDARD_CLASSES);
                     break;
             }