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
@@ -2016,7 +2016,10 @@
 						// Return to our original position
 						if (this.GetStance().respondHoldGround)
 							this.WalkToHeldPosition();
+						return;
 					}
+					if (this.CheckTargetAttackRange(this.order.data.target, this.order.data.attackType))
+						this.SetNextState("ATTACKING");
 				},
 
 				"MovementUpdate": function() {