diff --git a/OpenRa.Game/GameRules/ActorInfo.cs b/OpenRa.Game/GameRules/ActorInfo.cs
index 625a5dcfa9..93d53b4491 100644
--- a/OpenRa.Game/GameRules/ActorInfo.cs
+++ b/OpenRa.Game/GameRules/ActorInfo.cs
@@ -68,6 +68,9 @@ namespace OpenRa.GameRules
 
 		static ITraitInfo LoadTraitInfo(string traitName, MiniYaml my)
 		{
+			if (traitName.Contains('@'))
+				traitName = traitName.Substring(0, traitName.IndexOf('@'));
+
 			foreach (var mod in ModAssemblies)
 			{
 				var fullTypeName = mod.Second + "." + traitName + "Info";