diff --git a/Build/Scripting/ZDoom_DECORATE.cfg b/Build/Scripting/ZDoom_DECORATE.cfg
index f9df6c79..7d2bcbba 100644
--- a/Build/Scripting/ZDoom_DECORATE.cfg
+++ b/Build/Scripting/ZDoom_DECORATE.cfg
@@ -167,6 +167,7 @@ keywords
   A_SetShootable = "A_SetShootable";
   A_SetSolid = "A_SetSolid";
   A_SetSpecial = "A_SetSpecial(int special, int arg0, int arg1, int arg2, int arg3, int arg4)";
+  A_SetSpeed = "A_SetSpeed(float speed)";
   A_SetTics = "A_SetTics(int tics)";
   A_SetTranslucent = "A_SetTranslucent(float alpha, int mode)";
   A_SetUserVar = "A_SetUserVar(string name, int value)";
diff --git a/Source/Core/Data/DataManager.cs b/Source/Core/Data/DataManager.cs
index 606b3f04..5a88e727 100644
--- a/Source/Core/Data/DataManager.cs
+++ b/Source/Core/Data/DataManager.cs
@@ -1492,7 +1492,13 @@ namespace CodeImp.DoomBuilder.Data
 					// Parse the data
 					if(parser.Parse(group.Value, currentreader.Location.location + "\\" + group.Key)) {
 						foreach(KeyValuePair<string, ModelData> g in parser.Entries) {
-							modelDefEntriesByName.Add(g.Key, g.Value);
+							if (modelDefEntriesByName.ContainsKey(g.Key)) {
+								General.ErrorLogger.Add(ErrorType.Warning, "Model definition for actor '" + g.Key + "' is double-defined in '" + group.Key + "'");
+								modelDefEntriesByName[g.Key] = g.Value;
+							} else {
+								modelDefEntriesByName.Add(g.Key, g.Value);
+							}
+							
 						}
 					}
 				}