diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/AbstractTrackedLegSliceOfCompetitorWithContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/AbstractTrackedLegSliceOfCompetitorWithContext.java
index c0344cf589f..be87bd52a8c 100644
--- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/AbstractTrackedLegSliceOfCompetitorWithContext.java
+++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/AbstractTrackedLegSliceOfCompetitorWithContext.java
@@ -247,8 +247,7 @@ public abstract class AbstractTrackedLegSliceOfCompetitorWithContext implements
         final Integer result;
         if (getTrackedLegContext().getTrackedRaceContext().getTrackedRace() != null) {
             if (!isRankAtSliceStartInitialized) {
-                TrackedRace trackedRace = getTrackedLegContext().getTrackedRaceContext().getTrackedRace();
-                int rank = trackedRace.getRank(getCompetitor(), getSliceStartTime());
+                int rank = getTrackedLegOfCompetitor().getRank(getSliceStartTime());
                 rankAtSliceStart = rank == 0 ? null : rank;
                 isRankAtSliceStartInitialized = true;
             }
@@ -340,8 +339,7 @@ public abstract class AbstractTrackedLegSliceOfCompetitorWithContext implements
     
     public Integer getRankAtSliceFinish() {
         if (!isRankAtSliceFinishInitialized) {
-            TrackedRace trackedRace = getTrackedLegContext().getTrackedRaceContext().getTrackedRace();
-            int rank = trackedRace.getRank(getCompetitor(), getSliceFinishTime());
+            int rank = getTrackedLegOfCompetitor().getRank(getSliceFinishTime());
             rankAtSliceFinish = rank == 0 ? null : rank;
             isRankAtSliceFinishInitialized = true;
         }