Index: binaries/data/mods/public/simulation/components/UnitAI.js
===================================================================
--- binaries/data/mods/public/simulation/components/UnitAI.js
+++ binaries/data/mods/public/simulation/components/UnitAI.js
@@ -1116,8 +1116,8 @@
 						this.FinishOrder();
 						return;
 					}
-					this.FindWalkAndFightTargets();
-					++this.stopSurveying;
+					if (!this.FindWalkAndFightTargets())
+						++this.stopSurveying;
 				}
 			}
 		},
@@ -1819,8 +1819,8 @@
 						this.FinishOrder();
 						return;
 					}
-					this.FindWalkAndFightTargets();
-					++this.stopSurveying;
+					if (!this.FindWalkAndFightTargets())
+						++this.stopSurveying;
 				}
 			}
 		},