diff --git a/core/src/com/unciv/logic/automation/NextTurnAutomation.kt b/core/src/com/unciv/logic/automation/NextTurnAutomation.kt
index 1b70816007..bcab9d9413 100644
--- a/core/src/com/unciv/logic/automation/NextTurnAutomation.kt
+++ b/core/src/com/unciv/logic/automation/NextTurnAutomation.kt
@@ -447,7 +447,8 @@ class NextTurnAutomation{
             when {
                 unit.type.isRanged() -> rangedUnits.add(unit)
                 unit.type.isMelee() -> meleeUnits.add(unit)
-                unit.name == civInfo.getEquivalentUnit(Constants.greatGeneral).name -> generals.add(unit) //generals move after military units
+                unit.name == Constants.greatGeneral || unit.baseUnit.replaces == Constants.greatGeneral
+                    -> generals.add(unit) //generals move after military units
                 else -> civilianUnits.add(unit)
             }
         }
diff --git a/core/src/com/unciv/logic/automation/UnitAutomation.kt b/core/src/com/unciv/logic/automation/UnitAutomation.kt
index ccd8bf2e4d..c6d867921d 100644
--- a/core/src/com/unciv/logic/automation/UnitAutomation.kt
+++ b/core/src/com/unciv/logic/automation/UnitAutomation.kt
@@ -44,7 +44,7 @@ class UnitAutomation {
             return SpecificUnitAutomation().automateWorkBoats(unit)
         }
 
-        if (unit.name == unit.civInfo.getEquivalentUnit(Constants.greatGeneral).name)
+        if (unit.name == Constants.greatGeneral || unit.baseUnit.replaces == Constants.greatGeneral)
             return SpecificUnitAutomation().automateGreatGeneral(unit)
 
         if (unit.type == UnitType.Fighter)