diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 34e2983..0a08978 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -1463,7 +1463,7 @@ Weapon* Creature::ChooseNextWeapon(int curr_weapon_slot_id, int begin_slot_id, i
         abort();
     }
     Weapon* next_weapon = nullptr;
-    for (int i = 1; i <= (end_slot_id - begin_slot_id); ++i) {
+    for (int i = 1; i <= (end_slot_id - begin_slot_id + 1); ++i) {
         int slot_id = begin_slot_id +
             (i + curr_weapon_slot_id - begin_slot_id) % (end_slot_id - begin_slot_id + 1);
         int idx = -1;