diff --git a/OpenRA.Game/Traits/AI/AutoTarget.cs b/OpenRA.Game/Traits/AI/AutoTarget.cs
index c8b120ba30..a3b9cd146e 100644
--- a/OpenRA.Game/Traits/AI/AutoTarget.cs
+++ b/OpenRA.Game/Traits/AI/AutoTarget.cs
@@ -67,6 +67,7 @@ namespace OpenRA.Traits
 			return inRange
 				.Where(a => a.Owner != null && self.Owner.Stances[ a.Owner ] == Stance.Enemy)
 				.Where(a => Combat.HasAnyValidWeapons(self, a))
+				.Where(a => !a.traits.Contains<Cloak>() || !a.traits.Get<Cloak>().Cloaked)
 				.OrderBy(a => (a.Location - self.Location).LengthSquared)
 				.FirstOrDefault();
 		}
diff --git a/mods/ra/vehicles.yaml b/mods/ra/vehicles.yaml
index 7771e2be1f..944dc78e10 100644
--- a/mods/ra/vehicles.yaml
+++ b/mods/ra/vehicles.yaml
@@ -390,7 +390,6 @@ SS:
 		Sight: 6
 		Speed: 6
 		WaterBound: yes
-		TargetType: Sub
 	RenderUnit:
 	Cloak:
 		InitialDelay: .4