diff --git a/OpenRa.Game/Actor.cs b/OpenRa.Game/Actor.cs
index 4a731827fa..eeb7d9a601 100755
--- a/OpenRa.Game/Actor.cs
+++ b/OpenRa.Game/Actor.cs
@@ -95,6 +95,7 @@ namespace OpenRa.Game
 			
 			// HACK: Get the first unit in the cell
 			// This will need to be updated for multiple-infantry-in-a-cell
+			// HACK: this doesn't work for targeting air units either
 			var underCursor = Game.UnitInfluence.GetUnitsAt( xy ).FirstOrDefault()
 				?? Game.BuildingInfluence.GetBuildingAt( xy );
 
diff --git a/OpenRa.Game/LocalOrderSource.cs b/OpenRa.Game/LocalOrderSource.cs
index b088b19a9e..2bee88f8cc 100644
--- a/OpenRa.Game/LocalOrderSource.cs
+++ b/OpenRa.Game/LocalOrderSource.cs
@@ -8,10 +8,12 @@ namespace OpenRa.Game
 
 		public List<Order> OrdersForFrame(int currentFrame)
 		{
-			// TODO: prune `orders` based on currentFrame.
 			if (!orders.ContainsKey(currentFrame))
 				return new List<Order>();
-			return orders[currentFrame];
+
+			var result = orders[currentFrame];
+			orders.Remove(currentFrame);
+			return result;
 		}
 
 		public void SendLocalOrders(int localFrame, List<Order> localOrders)