diff --git a/README.md b/README.md
index b76c7c26..c99fd997 100644
--- a/README.md
+++ b/README.md
@@ -111,6 +111,7 @@
 
 ### M1911
 * Upgraded: given as last stand pistol above all others except Ray Gun Mark 2
+* Upgraded: decreased last stand ammo from 2 clips to 1 clip
 
 ### M1927
 * Decreased ammo cost from 800 to 750
@@ -161,6 +162,7 @@
 * Same probability to obtain as other weapons
 * Can be obtained if player has Ray Gun
 * Limited to 1 player on all maps
+* Decreased last stand ammo from 3 clips to 1 clip
 
 ### Jet Gun
 * Kills multiple enemies significantly faster
diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc
index 9842fb38..e075aa98 100644
--- a/scripts/zm/_zm_reimagined.gsc
+++ b/scripts/zm/_zm_reimagined.gsc
@@ -1764,33 +1764,33 @@ last_stand_pistol_swap()
 	{
 		self setweaponammostock( self.laststandpistol, doubleclip );
 	}
-	else if ( self.laststandpistol == "ray_gun_zm" || self.laststandpistol == "ray_gun_upgraded_zm" )
+	else if ( self.laststandpistol == "ray_gun_zm" || self.laststandpistol == "ray_gun_upgraded_zm" || self.laststandpistol == "raygun_mark2_zm" || self.laststandpistol == "raygun_mark2_upgraded_zm" || self.laststandpistol == "m1911_upgraded_zm" )
 	{
-		if ( self.stored_weapon_info[ self.laststandpistol ].total_amt >= ammoclip )
+		amt = ammoclip;
+		if(amt > self.stored_weapon_info[self.laststandpistol].total_amt)
 		{
-			amt = ammoclip - self.stored_weapon_info[self.laststandpistol].clip_amt;
-			self setWeaponAmmoStock(self.laststandpistol, amt);
-			self.stored_weapon_info[self.laststandpistol].given_amt = amt;
+			amt = self.stored_weapon_info[self.laststandpistol].total_amt;
 		}
-		else
-		{
-			amt = self.stored_weapon_info[self.laststandpistol].total_amt - self.stored_weapon_info[self.laststandpistol].clip_amt;
-			self setWeaponAmmoStock(self.laststandpistol, amt);
-			self.stored_weapon_info[self.laststandpistol].given_amt = amt;
-		}
-	}
-	else if ( self.stored_weapon_info[ self.laststandpistol ].total_amt >= (ammoclip + doubleclip) )
-	{
-		amt = (ammoclip + doubleclip) - (self.stored_weapon_info[self.laststandpistol].clip_amt + self.stored_weapon_info[self.laststandpistol].left_clip_amt);
-		self setweaponammostock( self.laststandpistol, amt );
-		self.stored_weapon_info[ self.laststandpistol ].given_amt = amt;
+
+		amt -= (self.stored_weapon_info[self.laststandpistol].clip_amt + self.stored_weapon_info[self.laststandpistol].left_clip_amt);
+
+		self setWeaponAmmoStock(self.laststandpistol, amt);
+		self.stored_weapon_info[self.laststandpistol].given_amt = amt;
 	}
 	else
 	{
-		amt = self.stored_weapon_info[self.laststandpistol].total_amt - (self.stored_weapon_info[self.laststandpistol].clip_amt + self.stored_weapon_info[self.laststandpistol].left_clip_amt);
+		amt = ammoclip + doubleclip;
+		if(amt > self.stored_weapon_info[self.laststandpistol].total_amt)
+		{
+			amt = self.stored_weapon_info[self.laststandpistol].total_amt;
+		}
+
+		amt -= (self.stored_weapon_info[self.laststandpistol].clip_amt + self.stored_weapon_info[self.laststandpistol].left_clip_amt);
+
 		self setweaponammostock( self.laststandpistol, amt );
 		self.stored_weapon_info[ self.laststandpistol ].given_amt = amt;
 	}
+
 	self switchtoweapon( self.laststandpistol );
 }