diff --git a/core/src/com/unciv/logic/GameInfo.kt b/core/src/com/unciv/logic/GameInfo.kt
index 12d87c3c15..bdb3e24c92 100644
--- a/core/src/com/unciv/logic/GameInfo.kt
+++ b/core/src/com/unciv/logic/GameInfo.kt
@@ -150,8 +150,13 @@ class GameInfo {
                 continue
             }
 
+            if(unit.health < 100){
+                healUnit()
+                continue
+            }
+
             // else, go to a random space
-            unit.moveToTile(distanceToTiles.keys.toList().getRandom())
+            unit.moveToTile(distanceToTiles.keys.filter { it.unit==null }.toList().getRandom())
         }
     }