diff --git a/language.version b/language.version
index ca86f31e2..839bc627c 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r616 \cu(Wed 16 Nov 22:33:26 CET 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r616 \cu(2022-11-16 22:33:26)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r617 \cu(Wed 16 Nov 22:34:26 CET 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r617 \cu(2022-11-16 22:34:26)\c-";
diff --git a/zscript/hud/swwm_hud.zsc b/zscript/hud/swwm_hud.zsc
index 5d5b33850..82ed33700 100644
--- a/zscript/hud/swwm_hud.zsc
+++ b/zscript/hud/swwm_hud.zsc
@@ -2743,7 +2743,19 @@ Class SWWMStatusBar : BaseStatusBar
 				amax = GetDefaultByType(a).MaxAmount;
 				let def = GetDefaultByType(a);
 				if ( def.MagAmmoType )
-					amax *= GetDefaultByType(def.MagAmmoType).ClipSize;
+				{
+					let mag = MagAmmo(CPlayer.mo.FindInventory(def.MagAmmoType));
+					if ( mag )
+					{
+						amt = mag.Amount;
+						amax = amax*mag.ClipSize+mag.MaxAmount;
+					}
+					else
+					{
+						let defmag = GetDefaultByType(def.MagAmmoType);
+						amax = amax*defmag.ClipSize+defmag.MaxAmount;
+					}
+				}
 			}
 			else
 			{