diff --git a/language.version b/language.version
index 74cf243de..8dab43984 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r517 \cu(Mon 31 May 16:17:59 CEST 2021)\c-";
-SWWM_SHORTVER="\cw0.9.11b-pre r517 \cu(2021-05-31 16:17:59)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r518 \cu(Mon 31 May 16:23:12 CEST 2021)\c-";
+SWWM_SHORTVER="\cw0.9.11b-pre r518 \cu(2021-05-31 16:23:12)\c-";
diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc
index f49a17c1f..7b725bb3e 100644
--- a/zscript/swwm_player.zsc
+++ b/zscript/swwm_player.zsc
@@ -2934,7 +2934,7 @@ Class Demolitionist : PlayerPawn
 		Goto Spawn+1;
 	Jump:
 		#### # 2;
-		XZWJ ABCDEF 2;
+		XZWJ ABCDEF 2 A_JumpIf(player.onground&&!bNoGravity&&(waterlevel<3),"FallEnd");
 		Goto FallLoop;
 	Fall:
 		// start fall