diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFile.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFile.java
index 293e495f692..38a477bbe7f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFile.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFile.java
@@ -124,7 +124,11 @@ public class JetFile extends PsiFileBase implements JetDeclarationContainer, Jet
         if (stub != null) {
             return stub.getPackageFqName();
         }
+        return getPackageFqNameByTree();
+    }
 
+    @NotNull
+    public FqName getPackageFqNameByTree() {
         JetPackageDirective packageDirective = getPackageDirective();
         if (packageDirective == null) {
             return FqName.ROOT;
@@ -158,7 +162,10 @@ public class JetFile extends PsiFileBase implements JetDeclarationContainer, Jet
         if (stub != null) {
             return stub.isScript();
         }
+        return isScriptByTree();
+    }
 
+    public boolean isScriptByTree() {
         return getScript() != null;
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFileStubBuilder.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFileStubBuilder.java
index ee1833ea839..f7a0e759a2a 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFileStubBuilder.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFileStubBuilder.java
@@ -31,6 +31,6 @@ public class JetFileStubBuilder extends DefaultStubBuilder {
         }
 
         JetFile jetFile = (JetFile) file;
-        return new PsiJetFileStubImpl(jetFile, jetFile.getPackageFqName().asString(), jetFile.isScript());
+        return new PsiJetFileStubImpl(jetFile, jetFile.getPackageFqNameByTree().asString(), jetFile.isScriptByTree());
     }
 }