diff --git a/language.version b/language.version
index 2be978a40..808efa25a 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.10 r1 \cu(Sun 17 Apr 19:51:10 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.2.10 r1 \cu(2022-04-17 19:51:10)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.10 r2 \cu(Sun 17 Apr 19:51:29 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.2.10 r2 \cu(2022-04-17 19:51:29)\c-";
diff --git a/zscript/kbase/swwm_kbase.zsc b/zscript/kbase/swwm_kbase.zsc
index a9c96368a..ae8c62294 100644
--- a/zscript/kbase/swwm_kbase.zsc
+++ b/zscript/kbase/swwm_kbase.zsc
@@ -163,8 +163,10 @@ Class DemolitionistMenu : GenericMenu
 		mSmallFont = Font.GetFont('TewiFont');
 		mTinyFont = Font.GetFont('MiniwiFont');
 		// note that we can assume 640x400 will always be the smallest resolution allowed by gzdoom, but we still need to handle widescreen
-		hs = max(min(floor(Screen.GetWidth()/640.),floor(Screen.GetHeight()/266.)),1.);
-		ss = (Screen.GetWidth(),Screen.GetHeight())/hs;
+		double sw = max(Screen.GetWidth(),640);
+		double sh = max(Screen.GetHeight(),400);
+		hs = max(min(floor(sw/640.),floor(sh/266.)),1.);
+		ss = (sw,sh)/hs;
 		ws.x = 640.;
 		double th = 640*(ss.y/ss.x);
 		ws.y = round(th);