diff --git a/plugin.yml b/plugin.yml
index 8547f705..57f11c17 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -3,7 +3,7 @@ name: NoCheatPlugin
 author: Evenprime
 
 main: cc.co.evenprime.bukkit.nocheat.NoCheatPlugin
-version: 0.6.8a
+version: 0.6.8b
 
 commands:
   nocheat:
diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java
index ec01a85c..51b19a30 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java
@@ -458,7 +458,13 @@ public class MovingCheck {
     	// Allow using a bug called "water elevator"
     	else if(types[w.getBlockTypeIdAt(values[0]+1, values[2]-1, values[3]+1)] == BlockType.LIQUID ||
     		 types[w.getBlockTypeIdAt(values[0]+1, values[2], values[3]+1)] == BlockType.LIQUID ||
-    		 types[w.getBlockTypeIdAt(values[0]+1, values[2]+1, values[3]+1)] == BlockType.LIQUID)
+    		 types[w.getBlockTypeIdAt(values[0]+1, values[2]+1, values[3]+1)] == BlockType.LIQUID ||
+    		 types[w.getBlockTypeIdAt(values[0]+1, values[2]-1, values[3])] == BlockType.LIQUID ||
+    		 types[w.getBlockTypeIdAt(values[0]+1, values[2], values[3])] == BlockType.LIQUID ||
+    		 types[w.getBlockTypeIdAt(values[0]+1, values[2]+1, values[3])] == BlockType.LIQUID ||
+    		 types[w.getBlockTypeIdAt(values[0], values[2]-1, values[3])] == BlockType.LIQUID ||
+    		 types[w.getBlockTypeIdAt(values[0], values[2], values[3])] == BlockType.LIQUID ||
+    		 types[w.getBlockTypeIdAt(values[0], values[2]+1, values[3])] == BlockType.LIQUID)
     		return true;
     	else
     		return false;
diff --git a/src/cc/co/evenprime/bukkit/nocheat/listeners/NoCheatPlayerListener.java b/src/cc/co/evenprime/bukkit/nocheat/listeners/NoCheatPlayerListener.java
index 5a63af3d..38ed7706 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/listeners/NoCheatPlayerListener.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/listeners/NoCheatPlayerListener.java
@@ -52,6 +52,7 @@ public class NoCheatPlayerListener extends PlayerListener {
 			if(!event.getTo().equals(data.movingSetBackPoint) && !event.getTo().equals(data.speedhackSetBackPoint)) {
 				data.speedhackSetBackPoint = null;
 				data.movingSetBackPoint = null;
+				data.movingJumpPhase = 0;
 			}
 		}
     }