diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationImportTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationImportTest.java
index 8f4862a82f2..552d9b9aeb1 100755
--- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationImportTest.java
+++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationImportTest.java
@@ -55,7 +55,7 @@ public class DeclinationImportTest extends AbstractDeclinationTest {
     public void readOnlineOrFromFile() throws IOException, ClassNotFoundException, ParseException {
         Declination declination = importer.getDeclination(new DegreePosition(53, 3),
                 new MillisecondsTimePoint(simpleDateFormat.parse("2011-05-27").getTime()), 
-                /* timeoutForOnlineFetchInMilliseconds */ 5000);
+                /* timeoutForOnlineFetchInMilliseconds */ 10000);
         assertNotNull(declination);
         System.out.println(declination);
     }
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
index 987025b927b..0044ee2b24d 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
@@ -119,6 +119,9 @@ public class DynamicTrackedRaceImpl extends TrackedRaceImpl implements
             competitorMarkPassings.add(markPassing);
             getMarkPassingsInOrder(markPassing.getWaypoint()).add(markPassing);
             updated(markPassing.getTimePoint());
+        }
+        // notify *after* all mark passings have been re-established; should avoid flicker
+        for (MarkPassing markPassing : markPassings) {
             notifyListeners(markPassing);
         }
     }