diff --git a/hwe/sammo/CityHelper.php b/hwe/sammo/CityHelper.php
index 1bad62bb..de664322 100644
--- a/hwe/sammo/CityHelper.php
+++ b/hwe/sammo/CityHelper.php
@@ -29,13 +29,14 @@ class CityHelper{
         foreach (DB::db()->query('SELECT `city` as `id`, `name`, `level`, `nation` from city') as $city) {
             $id = $city['id'];
             $name = $city['name'];
+            $nationID = $city['nation'];
             $list[$id] = $city;
             $listInv[$city['name']] = $city;
 
-            if(!key_exists($id, $listByNation)){
-                $listByNation[$id] = [];
+            if(!key_exists($nationID, $listByNation)){
+                $listByNation[$nationID] = [];
             }
-            $listByNation[$id][] = $city;
+            $listByNation[$nationID][] = $city;
         }
 
         self::$list = $list;
diff --git a/hwe/sammo/Scenario.php b/hwe/sammo/Scenario.php
index b3cad337..deb28cdd 100644
--- a/hwe/sammo/Scenario.php
+++ b/hwe/sammo/Scenario.php
@@ -312,6 +312,8 @@ class Scenario{
 
             $nation->build($env);
         }
+        
+        refreshNationStaticInfo();
         CityHelper::flushCache();
 
         $remainGenerals = $this->buildGenerals($env);