diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileScopeImpl.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileScopeImpl.java
index 9d2ed801e38b..ee71486fac16 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileScopeImpl.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileScopeImpl.java
@@ -93,10 +93,13 @@ public class CompileScopeImpl extends CompileScope {
   @Override
   public boolean isAffected(BuildTarget<?> target, @NotNull File file) {
     if (myFiles.isEmpty()) {//optimization
-      return isAffected(target);
+      return isWholeTargetAffected(target);
     }
     final Set<File> files = myFiles.get(target);
-    return files != null && files.contains(file);
+    if (files == null) {
+      return isWholeTargetAffected(target);
+    }
+    return files.contains(file);
   }
 
   private boolean isAffectedByAssociatedModule(BuildTarget<?> target) {