diff --git a/core/src/com/unciv/logic/automation/UnitAutomation.kt b/core/src/com/unciv/logic/automation/UnitAutomation.kt
index 29fcbb706a..2c432e207c 100644
--- a/core/src/com/unciv/logic/automation/UnitAutomation.kt
+++ b/core/src/com/unciv/logic/automation/UnitAutomation.kt
@@ -48,16 +48,16 @@ object UnitAutomation {
 
     private fun tryGoToRuinAndEncampment(unit: MapUnit): Boolean {
         if (!unit.civInfo.isMajorCiv()) return false // barbs don't have anything to do in ruins
-        val unitDistanceToTiles = unit.movement.getDistanceToTiles()
-        val tileWithRuinOrEncampment = unitDistanceToTiles.keys
+
+        val tileWithRuinOrEncampment = unit.viewableTiles
             .firstOrNull {
                 (
-                    (it.improvement != null && it.getTileImprovement()!!.isAncientRuinsEquivalent())
-                    || it.improvement == Constants.barbarianEncampment
-                )
-                && unit.movement.canMoveTo(it)
+                        (it.improvement != null && it.getTileImprovement()!!.isAncientRuinsEquivalent())
+                                || it.improvement == Constants.barbarianEncampment
+                        )
+                        && unit.movement.canMoveTo(it)
             } ?: return false
-        unit.movement.moveToTile(tileWithRuinOrEncampment)
+        unit.movement.headTowards(tileWithRuinOrEncampment)
         return true
     }