diff --git a/android/build.gradle b/android/build.gradle
index f5f27c9e0b..7e064043ae 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,8 +21,8 @@ android {
         applicationId "com.unciv.app"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 248
-        versionName "2.16.10-patch1"
+        versionCode 249
+        versionName "2.17.0"
     }
 
     // Had to add this crap for Travis to build, it wanted to sign the app
diff --git a/core/src/com/unciv/ui/tilegroups/CityButton.kt b/core/src/com/unciv/ui/tilegroups/CityButton.kt
index f85f7a37a8..6ebf349f3c 100644
--- a/core/src/com/unciv/ui/tilegroups/CityButton.kt
+++ b/core/src/com/unciv/ui/tilegroups/CityButton.kt
@@ -149,8 +149,8 @@ class CityButton(val city: CityInfo, internal val tileGroup: WorldTileGroup, ski
             group.addActor(label)
 
             val adoptedPolicies = cityConstructions.cityInfo.civInfo.policies.adoptedPolicies
-            val constructionPercentage = cityConstructions.getWorkDone(cityConstructions.currentConstruction) /
-                    cityConstructions.getCurrentConstruction().getProductionCost(adoptedPolicies).toFloat()
+            val constructionPercentage = cityConstructions.getWorkDone(cityCurrentConstruction.name) /
+                    cityCurrentConstruction.getProductionCost(adoptedPolicies).toFloat()
             val productionBar = ImageGetter.getProgressBarVertical(2f, groupHeight, constructionPercentage
                     , Color.BROWN.cpy().lerp(Color.WHITE, 0.5f), Color.BLACK)
             productionBar.x = 10f