diff --git a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java
index e42a2919..9d2d78e4 100644
--- a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java
+++ b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java
@@ -1028,6 +1028,10 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
 		// TODO: on existing set back: detect world changes and loss of world on join (+ set up some paradigm).
 		data.clearMorePacketsData();
 		final Location loc = player.getLocation();
+		
+		// TODO: shouldCheckSurvivalFly ?
+		
+		// Correct set-back on world changes.
 		if (!data.hasSetBack() || data.hasSetBackWorldChanged(loc)){
 			data.setSetBack(loc);
 		}
@@ -1035,8 +1039,9 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
 			// TODO: re-think: more fine grained reset?
 			data.resetPositions(loc);
 		}
+		final MovingConfig cc = MovingConfig.getConfig(player);
 		// Reset hover ticks until a better method is used.
-		if (MovingConfig.getConfig(player).sfHoverCheck){
+		if (cc.sfHoverCheck){
 			// Start as if hovering already.
 			data.sfHoverTicks = 0;
 			hoverTicks.add(player.getName());
diff --git a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/SurvivalFly.java b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/SurvivalFly.java
index 834180b0..f742da76 100644
--- a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/SurvivalFly.java
+++ b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/SurvivalFly.java
@@ -42,7 +42,7 @@ public class SurvivalFly extends Check {
 	public static final double sprintingSpeed 	= 0.35D;
 	
 	public static final double blockingSpeed 	= 0.16D;
-	public static final double swimmingSpeed    = 0.11D;
+	public static final double swimmingSpeed    = 0.115D;
 	public static final double webSpeed         = 0.105D; // TODO: walkingSpeed * 0.15D; <- does not work
 	
 //	public static final double climbSpeed      = sprintingSpeed; // TODO.