diff --git a/compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironment.java b/compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironment.java
index 7d4c7ea5f85..1d1445118dd 100644
--- a/compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironment.java
+++ b/compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironment.java
@@ -85,7 +85,7 @@ public class CompileEnvironment {
             public void dispose() {
             }
         };
-        environment = new JetCoreEnvironment(rootDisposable, mode == CompilerSpecialMode.REGULAR);
+        environment = new JetCoreEnvironment(rootDisposable, mode.includeJdkHeaders());
         this.messageRenderer = messageRenderer;
     }
 
@@ -282,7 +282,7 @@ public class CompileEnvironment {
 
     public ClassFileFactory compileModule(Module moduleBuilder, String directory) {
         CompileSession moduleCompileSession = newCompileSession();
-        moduleCompileSession.setStubs(mode != CompilerSpecialMode.REGULAR);
+        moduleCompileSession.setStubs(mode.isStubs());
 
         if (moduleBuilder.getSourceFiles().isEmpty()) {
             throw new CompileEnvironmentException("No source files where defined");
@@ -403,7 +403,7 @@ public class CompileEnvironment {
 
     public boolean compileBunchOfSources(String sourceFileOrDir, String jar, String outputDir, boolean includeRuntime) {
         CompileSession session = newCompileSession();
-        session.setStubs(mode != CompilerSpecialMode.REGULAR);
+        session.setStubs(mode.isStubs());
 
         session.addSources(sourceFileOrDir);
 
@@ -412,7 +412,7 @@ public class CompileEnvironment {
 
     public boolean compileBunchOfSourceDirectories(List<String> sources, String jar, String outputDir, boolean includeRuntime) {
         CompileSession session = newCompileSession();
-        session.setStubs(mode != CompilerSpecialMode.REGULAR);
+        session.setStubs(mode.isStubs());
 
         for (String source : sources) {
             session.addSources(source);
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/CompilerSpecialMode.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/CompilerSpecialMode.java
index 91535c783ed..4fa7a42372c 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/CompilerSpecialMode.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/CompilerSpecialMode.java
@@ -29,4 +29,8 @@ public enum CompilerSpecialMode {
     public boolean includeJdkHeaders() {
         return this == REGULAR || this == STDLIB;
     }
+
+    public boolean isStubs() {
+        return this == BUILTINS || this == JDK_HEADERS;
+    }
 }