diff --git a/core/src/com/unciv/logic/battle/BattleDamage.kt b/core/src/com/unciv/logic/battle/BattleDamage.kt
index 4d7c02cf01..503dc76e62 100644
--- a/core/src/com/unciv/logic/battle/BattleDamage.kt
+++ b/core/src/com/unciv/logic/battle/BattleDamage.kt
@@ -87,9 +87,8 @@ object BattleDamage {
 
 
             val nearbyCivUnits = combatant.unit.getTile().getTilesInDistance(2)
-                    .filter { it.civilianUnit?.civInfo == combatant.unit.civInfo }
-                    .map { it.civilianUnit }
-            if (nearbyCivUnits.any { it!!.hasUnique("Bonus for units in 2 tile radius 15%") }) {
+                    .flatMap { it.getUnits() }.filter { it.civInfo == combatant.unit.civInfo }
+            if (nearbyCivUnits.any { it.hasUnique("Bonus for units in 2 tile radius 15%") }) {
                 val greatGeneralModifier = if (combatant.unit.civInfo.hasUnique("Great General provides double combat bonus")) 30 else 15
                 modifiers["Great General"] = greatGeneralModifier
             }