diff --git a/src/playsim/p_local.h b/src/playsim/p_local.h
index 594a3f0b5..79f530202 100644
--- a/src/playsim/p_local.h
+++ b/src/playsim/p_local.h
@@ -61,7 +61,6 @@ struct FLinePortal;
 #define USERANGE		(64.)
 
 #define DEFMELEERANGE		(64.)
-#define SAWRANGE		(64.+(1./65536.))	// use meleerange + 1 so the puff doesn't skip the flash (i.e. plays all states)
 #define MISSILERANGE	(32*64.)
 #define PLAYERMISSILERANGE	(8192.)	// [RH] New MISSILERANGE for players
 
diff --git a/wadsrc/static/zscript/actors/doom/weaponchainsaw.zs b/wadsrc/static/zscript/actors/doom/weaponchainsaw.zs
index e0e3de227..e4f3cc6c1 100644
--- a/wadsrc/static/zscript/actors/doom/weaponchainsaw.zs
+++ b/wadsrc/static/zscript/actors/doom/weaponchainsaw.zs
@@ -64,7 +64,7 @@ extend class StateProvider
 		}
 		if (range == 0)
 		{ 
-			range = SAWRANGE;
+			range = MeleeRange + (1. / 65536.); // MBF21 SAWRANGE;
 		}
 
 		double ang = angle + spread_xy * (Random2[Saw]() / 255.);
diff --git a/wadsrc/static/zscript/actors/doom/weaponfist.zs b/wadsrc/static/zscript/actors/doom/weaponfist.zs
index 6d857f7a2..c27188773 100644
--- a/wadsrc/static/zscript/actors/doom/weaponfist.zs
+++ b/wadsrc/static/zscript/actors/doom/weaponfist.zs
@@ -65,9 +65,9 @@ extend class Actor
 			damage *= 10;
 
 		double ang = angle + Random2[Punch]() * (5.625 / 256);
-		double pitch = AimLineAttack (ang, DEFMELEERANGE, null, 0., ALF_CHECK3D);
+		double pitch = AimLineAttack (ang, MeleeRange, null, 0., ALF_CHECK3D);
 
-		LineAttack (ang, DEFMELEERANGE, pitch, damage, 'Melee', "BulletPuff", LAF_ISMELEEATTACK, t);
+		LineAttack (ang, MeleeRange, pitch, damage, 'Melee', "BulletPuff", LAF_ISMELEEATTACK, t);
 
 		// turn to face target
 		if (t.linetarget)