diff --git a/android/build.gradle b/android/build.gradle
index e018d07bff..b09cb5dcb2 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,8 +21,8 @@ android {
         applicationId "com.unciv.app"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 232
-        versionName "2.15.0-patch1"
+        versionCode 233
+        versionName "2.15.0-patch2"
     }
 
     // Had to add this crap for Travis to build, it wanted to sign the app
diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt
index 840debe651..d5931cdada 100644
--- a/core/src/com/unciv/logic/map/TileInfo.kt
+++ b/core/src/com/unciv/logic/map/TileInfo.kt
@@ -246,7 +246,7 @@ open class TileInfo {
             var cityString = city.name
             if(isViewableToPlayer) cityString += " ("+city.health+")"
             lineList += cityString
-            if(UnCivGame.Current.viewEntireMapForDebug || city.civInfo.isPlayerCivilization())
+            if(UnCivGame.Current.viewEntireMapForDebug || city.civInfo.isCurrentPlayer())
                 lineList += city.cityConstructions.getProductionForTileInfo()
         }
         lineList += baseTerrain.tr()
diff --git a/core/src/com/unciv/ui/tilegroups/CityButton.kt b/core/src/com/unciv/ui/tilegroups/CityButton.kt
index 4b18123e64..a898a89521 100644
--- a/core/src/com/unciv/ui/tilegroups/CityButton.kt
+++ b/core/src/com/unciv/ui/tilegroups/CityButton.kt
@@ -56,14 +56,14 @@ class CityButton(val city: CityInfo, internal val tileGroup: WorldTileGroup, ski
         if (city.isCapital()) {
             val starImage = ImageGetter.getImage("OtherIcons/Star.png").apply { color = Color.LIGHT_GRAY }
             add(starImage).size(20f).pad(2f).padLeft(5f)
-        } else if (city.civInfo.isPlayerCivilization() && city.cityStats.isConnectedToCapital(RoadStatus.Road)) {
+        } else if (city.civInfo.isCurrentPlayer() && city.cityStats.isConnectedToCapital(RoadStatus.Road)) {
             val connectionImage = ImageGetter.getStatIcon("CityConnection")
             add(connectionImage).size(20f).pad(2f).padLeft(5f)
         } else {
             add()
         } // this is so the health bar is always 2 columns wide
         add(label).pad(10f)
-        if (UnCivGame.Current.viewEntireMapForDebug || city.civInfo.isPlayerCivilization()) {
+        if (UnCivGame.Current.viewEntireMapForDebug || city.civInfo.isCurrentPlayer()) {
             add(getConstructionGroup(city.cityConstructions)).padRight(5f)
         }
         pack()