diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java
index 81ebffbd007..ad8d491625c 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java
@@ -148,8 +148,8 @@ public class ScriptCodegen extends MemberCodegen {
         Type[] argTypes = jvmSignature.getAsmMethod().getArgumentTypes();
         int add = 0;
 
-        for (int i = 0; i < scriptDescriptor.getValueParameters().size(); i++) {
-            ValueParameterDescriptor parameter = scriptDescriptor.getValueParameters().get(i);
+        for (int i = 0; i < scriptDescriptor.getScriptCodeDescriptor().getValueParameters().size(); i++) {
+            ValueParameterDescriptor parameter = scriptDescriptor.getScriptCodeDescriptor().getValueParameters().get(i);
             frameMap.enter(parameter, argTypes[i + add]);
         }
 
@@ -169,7 +169,7 @@ public class ScriptCodegen extends MemberCodegen {
             instructionAdapter.putfield(classType.getInternalName(), getScriptFieldName(earlierScript), earlierClassType.getDescriptor());
         }
 
-        for (ValueParameterDescriptor parameter : scriptDescriptor.getValueParameters()) {
+        for (ValueParameterDescriptor parameter : scriptDescriptor.getScriptCodeDescriptor().getValueParameters()) {
             Type parameterType = typeMapper.mapType(parameter.getType());
             instructionAdapter.load(0, classType);
             instructionAdapter.load(offset, parameterType);
@@ -197,7 +197,7 @@ public class ScriptCodegen extends MemberCodegen {
             classBuilder.newField(null, access, getScriptFieldName(earlierScript), earlierClassName.getDescriptor(), null, null);
         }
 
-        for (ValueParameterDescriptor parameter : script.getValueParameters()) {
+        for (ValueParameterDescriptor parameter : script.getScriptCodeDescriptor().getValueParameters()) {
             Type parameterType = typeMapper.mapType(parameter);
             int access = ACC_PUBLIC | ACC_FINAL;
             classBuilder.newField(null, access, parameter.getName().getIdentifier(), parameterType.getDescriptor(), null, null);
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java
index ff5705ed3f3..1f8393b3c3b 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java
@@ -804,7 +804,7 @@ public class JetTypeMapper extends BindingTraceAware {
             signatureWriter.writeParameterTypeEnd();
         }
 
-        for (ValueParameterDescriptor valueParameter : script.getValueParameters()) {
+        for (ValueParameterDescriptor valueParameter : script.getScriptCodeDescriptor().getValueParameters()) {
             writeParameter(signatureWriter, valueParameter.getType());
         }
 
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptor.java
index 8cc4d4ef21e..88c2c811d4d 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptor.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptor.java
@@ -21,17 +21,12 @@ import org.jetbrains.jet.lang.descriptors.annotations.Annotated;
 import org.jetbrains.jet.lang.descriptors.impl.ScriptCodeDescriptor;
 import org.jetbrains.jet.lang.resolve.name.Name;
 
-import java.util.List;
-
 public interface ScriptDescriptor extends Annotated, DeclarationDescriptor, DeclarationDescriptorNonRoot {
     String LAST_EXPRESSION_VALUE_FIELD_NAME = "rv";
     Name NAME = Name.special("<script>");
 
     int getPriority();
 
-    @NotNull
-    List<ValueParameterDescriptor> getValueParameters();
-
     @NotNull
     ScriptCodeDescriptor getScriptCodeDescriptor();
 
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptorImpl.java
index 51e6b73ed6f..ee31d136957 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptorImpl.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptorImpl.java
@@ -74,6 +74,7 @@ public class ScriptDescriptorImpl extends DeclarationDescriptorNonRootImpl imple
             @NotNull List<? extends PropertyDescriptorImpl> properties,
             @NotNull List<? extends FunctionDescriptor> functions
     ) {
+        assert valueParameters != null : "setValueParameters() must be called before this method";
         scriptCodeDescriptor.initialize(implicitReceiver, valueParameters, returnType);
 
         PropertyDescriptorImpl propertyDescriptor = PropertyDescriptorImpl.create(classDescriptor,
@@ -120,12 +121,6 @@ public class ScriptDescriptorImpl extends DeclarationDescriptorNonRootImpl imple
         return priority;
     }
 
-    @Override
-    @NotNull
-    public List<ValueParameterDescriptor> getValueParameters() {
-        return valueParameters;
-    }
-
     @Override
     @NotNull
     public ScriptCodeDescriptor getScriptCodeDescriptor() {