--- deliantra/server/common/object.C	2009/06/27 08:35:03	1.284
+++ deliantra/server/common/object.C	2009/09/02 16:54:20	1.286
@@ -330,7 +330,7 @@
             return env;
 
           // else a player could have our env open
-          object *envest = env->outer_env ();
+          object *envest = env->outer_env_or_self ();
 
           // the player itself is always on a map, so we will find him here
           // even if our inv is in a player.
@@ -833,11 +833,13 @@
   if (active)
     return;
 
-  if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
-  if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
-
   if (has_active_speed ())
-    actives.insert (this);
+    {
+      if (flag [FLAG_FREED])
+        LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
+
+      actives.insert (this);
+    }
 }
 
 void