diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicGPSFixMovingTrackImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicGPSFixMovingTrackImpl.java
index 3f3dcfc8cb8..87f44801034 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicGPSFixMovingTrackImpl.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicGPSFixMovingTrackImpl.java
@@ -28,6 +28,7 @@ public class DynamicGPSFixMovingTrackImpl<ItemType> extends DynamicTrackImpl<Ite
      */
     @Override
     public SpeedWithBearing getEstimatedSpeed(TimePoint at) {
+        // TODO factor out the obtaining of relevant fixes which should be the same in super.getEstimatedSpeed(at)
         DummyGPSFixMoving atTimed = new DummyGPSFixMoving(at);
         NavigableSet<GPSFixMoving> beforeSet = getInternalFixes().headSet(atTimed, /* inclusive */ true);
         NavigableSet<GPSFixMoving> afterSet = getInternalFixes().tailSet(atTimed, /* inclusive */ true);
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java
index f986b3cc386..a4105e03dde 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java
@@ -107,7 +107,14 @@ public class TrackedLegOfCompetitorImpl implements TrackedLegOfCompetitor {
             if (hasFinishedLeg(timePoint)) {
                 timePointToUse = getMarkPassingForLegEnd().getTimePoint();
             } else {
-                timePointToUse = getTrackedRace().getTimePointOfNewestEvent();
+                // use time point of latest fix
+                GPSFixMoving lastFix = getTrackedRace().getTrack(getCompetitor()).getLastFix();
+                if (lastFix != null) {
+                    timePointToUse = lastFix.getTimePoint();
+                } else {
+                    // No fix at all? Then we can't determine any speed 
+                    return null;
+                }
             }
             Distance d = getDistanceTraveled(timePointToUse);
             long millis = timePointToUse.asMillis() - legStart.getTimePoint().asMillis();
diff --git a/java/com.sap.sailing.mongodb/src/com/sap/sailing/mongodb/MongoWindStoreFactory.java b/java/com.sap.sailing.mongodb/src/com/sap/sailing/mongodb/MongoWindStoreFactory.java
index e6f3528b6e5..a2114578c71 100755
--- a/java/com.sap.sailing.mongodb/src/com/sap/sailing/mongodb/MongoWindStoreFactory.java
+++ b/java/com.sap.sailing.mongodb/src/com/sap/sailing/mongodb/MongoWindStoreFactory.java
@@ -13,7 +13,6 @@ public interface MongoWindStoreFactory {
     /**
      * Gets the default Mongo store based on the properties mongo.hostname[=localhost], mongo.port[=27017]
      * and mongo.dbName[=&lt;contents of constant {@link #DEFAULT_DB_NAME}&gt;] specified in the bundle context
-     * @param mongoObjectFactory TODO
      */
     MongoWindStore getMongoWindStore(MongoObjectFactory mongoObjectFactory) throws UnknownHostException, MongoException;