diff --git a/OpenRa.Game/Traits/AttackBase.cs b/OpenRa.Game/Traits/AttackBase.cs
index 5e135dd77a..e9ff75aa51 100644
--- a/OpenRa.Game/Traits/AttackBase.cs
+++ b/OpenRa.Game/Traits/AttackBase.cs
@@ -128,6 +128,7 @@ namespace OpenRa.Game.Traits
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
 		{
 			if (mi.Button == MouseButton.Left || underCursor == null) return null;
+			if (self == underCursor) return null;
 			if (underCursor.Owner == self.Owner && !mi.Modifiers.HasModifier( Modifiers.Ctrl )) return null;
 			if (!Combat.HasAnyValidWeapons(self, underCursor)) return null;
 			return Order.Attack(self, underCursor);
diff --git a/units.ini b/units.ini
index b174b3b712..58fb6ce6b4 100755
--- a/units.ini
+++ b/units.ini
@@ -496,7 +496,7 @@ Traits=Unit, Mobile, RenderInfantry, AttackBase
 [MEDI]
 Description=Medic
 Voice=MedicVoice
-Traits=Unit, Mobile, RenderInfantry
+Traits=Unit, Mobile, RenderInfantry, AttackBase