diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
index aaeaa93baa6f..a34084fa28ea 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
@@ -498,7 +498,7 @@ public class BuildManager implements ApplicationComponent{
 
           final CmdlineRemoteProto.Message.ControllerMessage params;
           if (isRebuild) {
-            params = CmdlineProtoUtil.createRebuildRequest(projectPath, userData, globals);
+            params = CmdlineProtoUtil.createRebuildRequest(projectPath, scopes, userData, globals);
           }
           else {
             params = isMake ?
diff --git a/jps/jps-builders/src/org/jetbrains/jps/api/CmdlineProtoUtil.java b/jps/jps-builders/src/org/jetbrains/jps/api/CmdlineProtoUtil.java
index 318634a88604..38d0aa113a45 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/api/CmdlineProtoUtil.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/api/CmdlineProtoUtil.java
@@ -39,9 +39,9 @@ public class CmdlineProtoUtil {
   }
 
   public static CmdlineRemoteProto.Message.ControllerMessage createRebuildRequest(String project,
+                                                                                  List<TargetTypeBuildScope> scopes,
                                                                                   final Map<String, String> userData,
                                                                                   final CmdlineRemoteProto.Message.ControllerMessage.GlobalSettings globals) {
-    List<TargetTypeBuildScope> scopes = createAllModulesScopes();
     return createBuildParametersMessage(CmdlineRemoteProto.Message.ControllerMessage.ParametersMessage.Type.REBUILD, project,
                                         scopes, userData, Collections.<String>emptyList(),
                                         globals, null);