diff --git a/OpenRa.Game/Traits/Util.cs b/OpenRa.Game/Traits/Util.cs
index bde7f77c59..3e9018f05b 100755
--- a/OpenRa.Game/Traits/Util.cs
+++ b/OpenRa.Game/Traits/Util.cs
@@ -127,14 +127,14 @@ namespace OpenRa.Game.Traits
 
 		public static float GetEffectiveSpeed(Actor self)
 		{
-			var mi = self.LegacyInfo as LegacyMobileInfo;
-			if (mi == null) return 0f;
+			var unitInfo = self.Info.Traits.GetOrDefault<UnitInfo>();
+			if( unitInfo == null ) return 0f;
 
 			var modifier = self.traits
 				.WithInterface<ISpeedModifier>()
 				.Select(t => t.GetSpeedModifier())
 				.Product();
-			return mi.Speed * modifier;
+			return unitInfo.Speed * modifier;
 		}
 
 		public static IActivity SequenceActivities(params IActivity[] acts)