diff --git a/src/Charts/CPPlot.cpp b/src/Charts/CPPlot.cpp
index 7c91a50f1..1e7ec1e5d 100644
--- a/src/Charts/CPPlot.cpp
+++ b/src/Charts/CPPlot.cpp
@@ -1076,7 +1076,8 @@ CPPlot::plotTests(RideItem *rideitem)
 
         foreach(RideItem *r, context->athlete->rideCache->rides()) {
             // does it match ?
-            if (spec.pass(r)) rides << r;
+            if ((r->isSwim == isSwim) && (r->isRun == isRun) && spec.pass(r))
+                rides << r;
         }
 
         foreach (RideItem *item, rides) {