diff --git a/assets/levelB.gif b/assets/levelB.gif
index 7a6ffac..64698f2 100644
Binary files a/assets/levelB.gif and b/assets/levelB.gif differ
diff --git a/main.c b/main.c
index 15b0528..a678c13 100755
--- a/main.c
+++ b/main.c
@@ -1120,13 +1120,13 @@ void SFG_getPlayerWeaponInfo(
 
 void SFG_playerRotateWeapon(uint8_t next)
 {
-  RCL_Unit initialWeapon = SFG_player.weapon;
-  RCL_Unit increment = next ? 1 : -1;
+  uint8_t initialWeapon = SFG_player.weapon;
+  int8_t increment = next ? 1 : -1;
 
   while (1)
   {
-    SFG_player.weapon = 
-      RCL_wrap(SFG_player.weapon + increment,SFG_WEAPONS_TOTAL);
+    SFG_player.weapon =
+      (SFG_WEAPONS_TOTAL + SFG_player.weapon + increment) % SFG_WEAPONS_TOTAL;
 
     if (SFG_player.weapon == initialWeapon)
       break;