diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index 2277212bac..e846e2885d 100644
--- a/buildSrc/src/main/kotlin/BuildConfig.kt
+++ b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -3,8 +3,8 @@ package com.unciv.build
 object BuildConfig {
     const val kotlinVersion = "1.3.71"
     const val appName = "Unciv"
-    const val appCodeNumber = 495
-    const val appVersion = "3.11.10"
+    const val appCodeNumber = 496
+    const val appVersion = "3.11.10-patch1"
 
     const val gdxVersion = "1.9.12"
     const val roboVMVersion = "2.3.1"
diff --git a/core/src/com/unciv/logic/automation/ConstructionAutomation.kt b/core/src/com/unciv/logic/automation/ConstructionAutomation.kt
index 3ffd464bdb..328ee5d369 100644
--- a/core/src/com/unciv/logic/automation/ConstructionAutomation.kt
+++ b/core/src/com/unciv/logic/automation/ConstructionAutomation.kt
@@ -128,6 +128,7 @@ class ConstructionAutomation(val cityConstructions: CityConstructions){
             bfs.nextStep()
             if (tilesThatNeedWorkboat.any { bfs.hasReachedTile(it) })
                 break
+            if (bfs.hasEnded()) break
         }
         if (tilesThatNeedWorkboat.none { bfs.hasReachedTile(it) }) return
 
diff --git a/core/src/com/unciv/logic/map/BFS.kt b/core/src/com/unciv/logic/map/BFS.kt
index e7f0132811..d653f06066 100644
--- a/core/src/com/unciv/logic/map/BFS.kt
+++ b/core/src/com/unciv/logic/map/BFS.kt
@@ -18,13 +18,13 @@ class BFS(val startingPoint: TileInfo, val predicate : (TileInfo) -> Boolean) {
     }
 
     fun stepToEnd() {
-        while (tilesToCheck.isNotEmpty())
+        while (!hasEnded())
             nextStep()
     }
 
 
     fun stepUntilDestination(destination: TileInfo): BFS {
-        while (!tilesReached.containsKey(destination) && tilesToCheck.isNotEmpty())
+        while (!tilesReached.containsKey(destination) && !hasEnded())
             nextStep()
         return this
     }
@@ -52,6 +52,8 @@ class BFS(val startingPoint: TileInfo, val predicate : (TileInfo) -> Boolean) {
         return path
     }
 
+    fun hasEnded() = tilesToCheck.isEmpty()
+
     fun hasReachedTile(tile: TileInfo) =
             tilesReached.containsKey(tile)
 }
\ No newline at end of file