diff --git a/core/src/main/java/hudson/model/Label.java b/core/src/main/java/hudson/model/Label.java
index 87f224bf96b05d56ca7ca81650e612f1e084ac9b..f0a2df24744284c61f61cebcee18ef4f7b1e4b3f 100644
--- a/core/src/main/java/hudson/model/Label.java
+++ b/core/src/main/java/hudson/model/Label.java
@@ -115,8 +115,8 @@ public abstract class Label extends Actionable implements Comparable<Label>, Mod
             }
 
             @Override
-            protected boolean matches(SubTask item) {
-                final Label l = item.getAssignedLabel();
+            protected boolean matches(Queue.Item item, SubTask subTask) {
+                final Label l = item.getAssignedLabelFor(subTask);
                 return l != null && Label.this.matches(l.name);
             }
         };
diff --git a/core/src/main/java/hudson/model/LoadStatistics.java b/core/src/main/java/hudson/model/LoadStatistics.java
index 45cf4f4a32bd200b0d7f094039038f4bab3f96c0..a296551593cd796fb8b93c319d00d7b5456842c3 100644
--- a/core/src/main/java/hudson/model/LoadStatistics.java
+++ b/core/src/main/java/hudson/model/LoadStatistics.java
@@ -24,7 +24,6 @@
 package hudson.model;
 
 import hudson.Extension;
-import hudson.Util;
 import hudson.model.MultiStageTimeSeries.TimeScale;
 import hudson.model.MultiStageTimeSeries.TrendChart;
 import hudson.model.queue.SubTask;
@@ -310,11 +309,12 @@ public abstract class LoadStatistics {
 
     /**
      * Returns {@code true} is the specified {@link SubTask} from the {@link Queue} should be counted.
-     * @param item the {@link SubTask}
+     * @param item the {@link Queue.Item} that the {@link SubTask belongs to}
+     * @param subTask the {@link SubTask}
      * @return {@code true} IFF the specified {@link SubTask} from the {@link Queue} should be counted.
      * @since 1.607
      */
-    protected abstract boolean matches(SubTask item);
+    protected abstract boolean matches(Queue.Item item, SubTask subTask);
 
     /**
      * Computes a self-consistent snapshot of the load statistics.
@@ -355,8 +355,9 @@ public abstract class LoadStatistics {
         int q = 0;
         if (queue != null) {
             for (Queue.BuildableItem item : queue) {
+                
                 for (SubTask st : item.task.getSubTasks()) {
-                    if (matches(st))
+                    if (matches(item, st))
                         q++;
                 }
             }
diff --git a/core/src/main/java/hudson/model/OverallLoadStatistics.java b/core/src/main/java/hudson/model/OverallLoadStatistics.java
index 736a4630f77add61fb5666d8061b3638e9e37013..98d9852ac91a08f412273d8ce8ccd6edb9f01870 100644
--- a/core/src/main/java/hudson/model/OverallLoadStatistics.java
+++ b/core/src/main/java/hudson/model/OverallLoadStatistics.java
@@ -75,7 +75,7 @@ public class OverallLoadStatistics extends LoadStatistics {
     }
 
     @Override
-    protected boolean matches(SubTask item) {
+    protected boolean matches(Queue.Item item, SubTask subTask) {
         return true;
     }
 
diff --git a/core/src/main/java/jenkins/model/UnlabeledLoadStatistics.java b/core/src/main/java/jenkins/model/UnlabeledLoadStatistics.java
index 5ce2d63d6ce78c3bc47ed769e6d899959009bf7b..155cfc73811a148276df2985de5c4ae765164f2a 100644
--- a/core/src/main/java/jenkins/model/UnlabeledLoadStatistics.java
+++ b/core/src/main/java/jenkins/model/UnlabeledLoadStatistics.java
@@ -28,15 +28,12 @@ import hudson.model.LoadStatistics;
 import hudson.model.Node;
 import hudson.model.Node.Mode;
 import hudson.model.OverallLoadStatistics;
+import hudson.model.Queue;
 import hudson.model.Queue.Task;
 import hudson.model.queue.SubTask;
 import hudson.util.Iterators;
 
 import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Set;
 
 /**
  * {@link LoadStatistics} that track the "free roam" jobs (whose {@link Task#getAssignedLabel()} is null)
@@ -90,8 +87,8 @@ public class UnlabeledLoadStatistics extends LoadStatistics {
     }
 
     @Override
-    protected boolean matches(SubTask item) {
-        return true;
+    protected boolean matches(Queue.Item item, SubTask subTask) {
+        return item.getAssignedLabelFor(subTask) == null;
     }
 
     private static class UnlabeledNodesIterable implements Iterable<Node> {
diff --git a/core/src/test/java/hudson/model/LoadStatisticsTest.java b/core/src/test/java/hudson/model/LoadStatisticsTest.java
index f2eeee4aed4696b1dd204ff88de7248de8dfbe0e..8c5d4091b78bb3a0efd51252fcb2a280a657e9ea 100644
--- a/core/src/test/java/hudson/model/LoadStatisticsTest.java
+++ b/core/src/test/java/hudson/model/LoadStatisticsTest.java
@@ -64,7 +64,7 @@ public class LoadStatisticsTest {
             }
 
             @Override
-            protected boolean matches(SubTask item) {
+            protected boolean matches(Queue.Item item, SubTask subTask) {
                 throw new UnsupportedOperationException();
             }
         };
@@ -129,7 +129,7 @@ public class LoadStatisticsTest {
         }
 
         @Override
-        protected boolean matches(SubTask item) {
+        protected boolean matches(Queue.Item item, SubTask subTask) {
             return false;
         }
     }