--- deliantra/server/server/player.C	2008/04/17 14:06:03	1.182
+++ deliantra/server/server/player.C	2008/04/20 20:01:29	1.183
@@ -406,7 +406,13 @@
 archetype *
 get_player_archetype (archetype *at)
 {
-  archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
+  // archetypes could have been reloaded
+  archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
+
+  if (!nat)
+    return at;
+
+  archvec::iterator i = archetypes.find (nat);
 
   for (;;)
     {