diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index d82183c6..3405c739 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -1746,7 +1746,7 @@ void Creature::RemoveSurplusHero(int hero_id, int num)
                 ++exists_num;
             }
         }
-        while (exists_num > num) {
+        while (exists_num > num && num > 0) {
             Hero* hero = list_first_entry(&itr->second,
                                           Hero,
                                           entry);
diff --git a/third_party/a8 b/third_party/a8
index b6c896a7..36958760 160000
--- a/third_party/a8
+++ b/third_party/a8
@@ -1 +1 @@
-Subproject commit b6c896a7c5be517ba12d1b069d58103b6214f09f
+Subproject commit 369587606d3c5626e38b2515fe6be56c0df28476