diff --git a/OpenRA.Mods.RA/HackyAI.cs b/OpenRA.Mods.RA/HackyAI.cs
index cee2e90737..e1fcb33735 100644
--- a/OpenRA.Mods.RA/HackyAI.cs
+++ b/OpenRA.Mods.RA/HackyAI.cs
@@ -249,8 +249,7 @@ namespace OpenRA.Mods.RA
 			{
 				BotDebug("AI: Found a newly built unit");
 				if (a.Info == Rules.Info["harv"])
-					a.QueueActivity(new FindResources());
-
+					world.IssueOrder( new Order( "Harvest", a, false ) );
 				else
 					unitsHangingAroundTheBase.Add(a);
 
diff --git a/OpenRA.Mods.RA/Harvester.cs b/OpenRA.Mods.RA/Harvester.cs
index ec7d7b4f8a..969891d7d5 100644
--- a/OpenRA.Mods.RA/Harvester.cs
+++ b/OpenRA.Mods.RA/Harvester.cs
@@ -154,9 +154,12 @@ namespace OpenRA.Mods.RA
 			{
 				var mobile = self.Trait<Mobile>();
 				self.CancelActivity();
-				self.QueueActivity(mobile.MoveTo(order.TargetLocation, 0));
+				if (order.TargetLocation != int2.Zero)
+				{
+					self.QueueActivity(mobile.MoveTo(order.TargetLocation, 0));
+					self.SetTargetLine(Target.FromOrder(order), Color.Red);
+				}
 				self.QueueActivity(new FindResources());
-				self.SetTargetLine(Target.FromOrder(order), Color.Red);
 			}
 			else if (order.OrderString == "Deliver")
 			{