diff --git a/OpenRA.Mods.RA/Air/Helicopter.cs b/OpenRA.Mods.RA/Air/Helicopter.cs
index 6b0356acd7..e43d3f418d 100755
--- a/OpenRA.Mods.RA/Air/Helicopter.cs
+++ b/OpenRA.Mods.RA/Air/Helicopter.cs
@@ -104,8 +104,11 @@ namespace OpenRA.Mods.RA.Air
 				self.QueueActivity(new HeliFly(order.TargetActor.Trait<IHasLocation>().PxPosition + offset));
 				self.QueueActivity(new Turn(Info.InitialFacing));
 				self.QueueActivity(new HeliLand(false));
-				self.QueueActivity(Info.RearmBuildings.Contains(order.TargetActor.Info.Name)
-					? (IActivity)new Rearm() : new Repair(order.TargetActor));
+				
+				if (Info.RearmBuildings.Contains(order.TargetActor.Info.Name))
+				    self.QueueActivity( new Rearm() );
+				if (Info.RepairBuildings.Contains(order.TargetActor.Info.Name))
+				    self.QueueActivity( new Repair( order.TargetActor ));
 			}
 
 			if (order.OrderString == "Stop")
diff --git a/OpenRA.Mods.RA/Air/Plane.cs b/OpenRA.Mods.RA/Air/Plane.cs
index 119db439be..7ea99e4256 100755
--- a/OpenRA.Mods.RA/Air/Plane.cs
+++ b/OpenRA.Mods.RA/Air/Plane.cs
@@ -103,9 +103,11 @@ namespace OpenRA.Mods.RA.Air
 
 				self.CancelActivity();
 				self.QueueActivity(new ReturnToBase(self, order.TargetActor));
-				self.QueueActivity(
-					info.RearmBuildings.Contains(order.TargetActor.Info.Name)
-						? (IActivity)new Rearm() : new Repair(order.TargetActor));
+				
+				if (Info.RearmBuildings.Contains(order.TargetActor.Info.Name))
+				    self.QueueActivity( new Rearm() );
+				if (Info.RepairBuildings.Contains(order.TargetActor.Info.Name))
+				    self.QueueActivity( new Repair( order.TargetActor ));
 			}
 			else if (order.OrderString == "Stop")
 			{