diff --git a/Classic/scripts/inventory.cs b/Classic/scripts/inventory.cs
index f945b3e..2b46c2c 100644
--- a/Classic/scripts/inventory.cs
+++ b/Classic/scripts/inventory.cs
@@ -530,7 +530,11 @@ function ShapeBase::cycleWeapon( %this, %data )
    %slot = -1;
    if ( %this.getMountedImage($WeaponSlot) != 0 )
    {
-      %curWeapon = %this.getMountedImage($WeaponSlot).item.getName();
+      if( %this.getMountedImage(0).getName() $= "RepairGunImage" ) //Console spam fix
+		%curWeapon = "RepairGunImage";
+	  else
+		%curWeapon = %this.getMountedImage($WeaponSlot).item.getName();
+	
       for ( %i = 0; %i < %this.weaponSlotCount; %i++ )
       {
          //error("curWeaponName == " @ %curWeaponName);