diff --git a/core/src/com/unciv/logic/city/CityExpansionManager.kt b/core/src/com/unciv/logic/city/CityExpansionManager.kt
index dc38f1b8f5..fdea563778 100644
--- a/core/src/com/unciv/logic/city/CityExpansionManager.kt
+++ b/core/src/com/unciv/logic/city/CityExpansionManager.kt
@@ -6,6 +6,7 @@ import com.unciv.logic.automation.Automation
 import com.unciv.logic.map.TileInfo
 import com.unciv.ui.utils.withItem
 import com.unciv.ui.utils.withoutItem
+import kotlin.math.max
 import kotlin.math.pow
 import kotlin.math.roundToInt
 
@@ -16,12 +17,16 @@ class CityExpansionManager {
 
     fun clone(): CityExpansionManager {
         val toReturn = CityExpansionManager()
-        toReturn.cultureStored=cultureStored
+        toReturn.cultureStored = cultureStored
         return toReturn
     }
 
-    fun tilesClaimed() = cityInfo.tiles.size - 7
-    fun isAreaMaxed(): Boolean = (cityInfo.tiles.size >= 90)
+    fun tilesClaimed(): Int {
+        val tilesAroundCity = cityInfo.getCenterTile().getTilesInDistance(1)
+                .map { it.position }
+        return cityInfo.tiles.filterNot { it in tilesAroundCity }.size
+    }
+    fun isAreaMaxed(): Boolean = cityInfo.tiles.size >= 90
 
     // This one has conflicting sources -
     // http://civilization.wikia.com/wiki/Mathematics_of_Civilization_V says it's 20+(10(t-1))^1.1
@@ -29,19 +34,20 @@ class CityExpansionManager {
     //   (per game XML files) at 6*(t+0.4813)^1.3
     // The second seems to be more based, so I'll go with that
     fun getCultureToNextTile(): Int {
-        var cultureToNextTile = 6 * (kotlin.math.max(0, tilesClaimed()) + 1.4813).pow(1.3)
+        var cultureToNextTile = 6 * (max(0, tilesClaimed()) + 1.4813).pow(1.3)
         if (cityInfo.civInfo.containsBuildingUnique("Cost of acquiring new tiles reduced by 25%"))
             cultureToNextTile *= 0.75 //Speciality of Angkor Wat
-        if(cityInfo.containsBuildingUnique("Culture and Gold costs of acquiring new tiles reduced by 25% in this city"))
+        if (cityInfo.containsBuildingUnique("Culture and Gold costs of acquiring new tiles reduced by 25% in this city"))
             cultureToNextTile *= 0.75 // Specialty of Krepost
         if (cityInfo.civInfo.policies.isAdopted("Tradition")) cultureToNextTile *= 0.75
         return cultureToNextTile.roundToInt()
     }
 
-    fun buyTile(tileInfo: TileInfo){
+    fun buyTile(tileInfo: TileInfo) {
         val goldCost = getGoldCostOfTile(tileInfo)
+
         class NotEnoughGoldToBuyTileException : Exception()
-        if(cityInfo.civInfo.gold<goldCost) throw NotEnoughGoldToBuyTileException()
+        if (cityInfo.civInfo.gold < goldCost) throw NotEnoughGoldToBuyTileException()
         cityInfo.civInfo.gold -= goldCost
         takeOwnership(tileInfo)
     }
@@ -49,14 +55,14 @@ class CityExpansionManager {
     fun getGoldCostOfTile(tileInfo: TileInfo): Int {
         val baseCost = 50
         val distanceFromCenter = tileInfo.aerialDistanceTo(cityInfo.getCenterTile())
-        var cost = baseCost * (distanceFromCenter-1) + tilesClaimed()*5.0
+        var cost = baseCost * (distanceFromCenter - 1) + tilesClaimed() * 5.0
 
         if (cityInfo.civInfo.containsBuildingUnique("Cost of acquiring new tiles reduced by 25%"))
             cost *= 0.75 //Speciality of Angkor Wat
-        if(cityInfo.containsBuildingUnique("Culture and Gold costs of acquiring new tiles reduced by 25% in this city"))
+        if (cityInfo.containsBuildingUnique("Culture and Gold costs of acquiring new tiles reduced by 25% in this city"))
             cost *= 0.75 // Specialty of Krepost
 
-        if(cityInfo.civInfo.nation.unique == UniqueAbility.MANIFEST_DESTINY)
+        if (cityInfo.civInfo.nation.unique == UniqueAbility.MANIFEST_DESTINY)
             cost /= 2
         return cost.toInt()
     }
@@ -65,8 +71,10 @@ class CityExpansionManager {
     fun chooseNewTileToOwn(): TileInfo? {
         for (i in 2..5) {
             val tiles = cityInfo.getCenterTile().getTilesInDistance(i)
-                    .filter { it.getOwner() == null
-                            && it.neighbors.any { tile -> tile.getOwner() == cityInfo.civInfo } }
+                    .filter {
+                        it.getOwner() == null
+                                && it.neighbors.any { tile -> tile.getCity() == cityInfo }
+                    }
             val chosenTile = tiles.maxBy { Automation.rankTile(it, cityInfo.civInfo) }
             if (chosenTile != null)
                 return chosenTile
@@ -90,12 +98,12 @@ class CityExpansionManager {
     }
 
     private fun addNewTileWithCulture(): Boolean {
-        if ( isAreaMaxed() ) {
+        if (isAreaMaxed()) {
             cultureStored = 0
             return false
         }
         val chosenTile = chooseNewTileToOwn()
-        if (chosenTile!=null) {
+        if (chosenTile != null) {
             cultureStored -= getCultureToNextTile()
             takeOwnership(chosenTile)
             return true
@@ -103,19 +111,19 @@ class CityExpansionManager {
         return false
     }
 
-    fun relinquishOwnership(tileInfo: TileInfo){
+    fun relinquishOwnership(tileInfo: TileInfo) {
         cityInfo.tiles = cityInfo.tiles.withoutItem(tileInfo.position)
-        if(cityInfo.workedTiles.contains(tileInfo.position))
+        if (cityInfo.workedTiles.contains(tileInfo.position))
             cityInfo.workedTiles = cityInfo.workedTiles.withoutItem(tileInfo.position)
-        tileInfo.owningCity=null
+        tileInfo.owningCity = null
 
         cityInfo.civInfo.updateDetailedCivResources()
         cityInfo.cityStats.update()
     }
 
-    fun takeOwnership(tileInfo: TileInfo){
-        if(tileInfo.isCityCenter()) throw Exception("What?!")
-        if(tileInfo.getCity()!=null)
+    fun takeOwnership(tileInfo: TileInfo) {
+        if (tileInfo.isCityCenter()) throw Exception("What?!")
+        if (tileInfo.getCity() != null)
             tileInfo.getCity()!!.expansion.relinquishOwnership(tileInfo)
 
         cityInfo.tiles = cityInfo.tiles.withItem(tileInfo.position)
@@ -124,8 +132,8 @@ class CityExpansionManager {
         cityInfo.civInfo.updateDetailedCivResources()
         cityInfo.cityStats.update()
 
-        for(unit in tileInfo.getUnits())
-            if(!unit.civInfo.canEnterTiles(cityInfo.civInfo))
+        for (unit in tileInfo.getUnits())
+            if (!unit.civInfo.canEnterTiles(cityInfo.civInfo))
                 unit.movement.teleportToClosestMoveableTile()
 
         cityInfo.civInfo.updateViewableTiles()
@@ -135,14 +143,14 @@ class CityExpansionManager {
         cultureStored += culture.toInt()
         if (cultureStored >= getCultureToNextTile()) {
             if (addNewTileWithCulture())
-                cityInfo.civInfo.addNotification("["+cityInfo.name + "] has expanded its borders!", cityInfo.location, Color.PURPLE)
+                cityInfo.civInfo.addNotification("[" + cityInfo.name + "] has expanded its borders!", cityInfo.location, Color.PURPLE)
         }
     }
 
-    fun setTransients(){
+    fun setTransients() {
         val tiles = cityInfo.getTiles()
-        for(tile in tiles )
-            tile.owningCity=cityInfo
+        for (tile in tiles)
+            tile.owningCity = cityInfo
     }
     //endregion
 }
\ No newline at end of file