diff --git a/changelog.txt b/changelog.txt
index d5312dd4e..7ed3f35a7 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,7 @@
 EQEMu Changelog (Started on Sept 24, 2003 15:50)
 -------------------------------------------------------
+== 02/03/2015 ==
+Trevius: Crashfix for TempName() when numbers are passed at the end of the name.
 
 == 02/02/2015 ==
 Akkadius: Implement Packet logs with dumps
diff --git a/zone/mob.cpp b/zone/mob.cpp
index 68ed1e35d..68e18c0db 100644
--- a/zone/mob.cpp
+++ b/zone/mob.cpp
@@ -1982,9 +1982,10 @@ void Mob::TempName(const char *newname)
 		strn0cpy(temp_name, GetCleanName(), 64);
 	}
 
+	// Remove Numbers before making name unique
+	EntityList::RemoveNumbers(temp_name);
 	// Make the new name unique and set it
-	strn0cpy(temp_name, entity_list.MakeNameUnique(temp_name), 64);
-
+	entity_list.MakeNameUnique(temp_name);
 
 	// Send the new name to all clients
 	EQApplicationPacket* outapp = new EQApplicationPacket(OP_MobRename, sizeof(MobRename_Struct));