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 f1dbfc5f274..145abd2b718 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
@@ -92,6 +92,10 @@ public class DeclarationResolver {
         resolveConstructorHeaders(c);
         resolveAnnotationStubsOnClassesAndConstructors(c);
         resolveFunctionAndPropertyHeaders(c);
+
+        // SCRIPT: Resolve script declarations
+        scriptHeaderResolver.resolveScriptDeclarations(c);
+
         createFunctionsForDataClasses(c);
         importsResolver.processMembersImports(c);
         checkRedeclarationsInPackages(c);
@@ -150,9 +154,6 @@ public class DeclarationResolver {
                     classDescriptor.getBuilder());
         }
 
-        // SCRIPT: Resolve script declarations, move outside of this function
-        scriptHeaderResolver.resolveScriptDeclarations(c);
-
         // TODO : Extensions
     }