diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/BoatClassImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/BoatClassImpl.java
index 30334e1b0cf..4a616df523f 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/BoatClassImpl.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/BoatClassImpl.java
@@ -21,7 +21,7 @@ public class BoatClassImpl extends NamedImpl implements BoatClass {
 
     public BoatClassImpl(String name) {
         super(name);
-        approximateManeuverDurationInMilliseconds = 5000; // as discussed with Dennis Gehrlein
+        approximateManeuverDurationInMilliseconds = 8000; // as discussed with Dennis Gehrlein
     }
 
     @Override
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
index 87faba194e8..b08c8a03d95 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
@@ -765,9 +765,9 @@ public abstract class TrackedRaceImpl implements TrackedRace, CourseListener {
         TimePoint maneuverTimePoint = new MillisecondsTimePoint(totalMilliseconds/group.size());
         Position maneuverPosition = getTrack(competitor).getEstimatedPosition(maneuverTimePoint, /* extrapolate */ false);
         MillisecondsTimePoint timePointBeforeManeuver = new MillisecondsTimePoint(group.get(0).getA().getTimePoint()
-                .asMillis() - getApproximateManeuverDurationInMilliseconds());
+                .asMillis() - getApproximateManeuverDurationInMilliseconds()/2);
         MillisecondsTimePoint timePointAfterManeuver = new MillisecondsTimePoint(group.get(group.size() - 1).getA()
-                .getTimePoint().asMillis() + getApproximateManeuverDurationInMilliseconds());
+                .getTimePoint().asMillis() + getApproximateManeuverDurationInMilliseconds()/2);
         Tack tackBeforeManeuver = getTack(competitor, timePointBeforeManeuver);
         Tack tackAfterManeuver = getTack(competitor, timePointAfterManeuver);
         // the TrackedLegOfCompetitor variables may be null, e.g., in case the time points are before or after the race