diff --git a/std/player/comm_vault.c b/std/player/comm_vault.c
index 81541d6..af983ec 100644
--- a/std/player/comm_vault.c
+++ b/std/player/comm_vault.c
@@ -5,10 +5,10 @@
 
 inherit "/std/player/comm_structs";
 
-nosave string uuid;
+private nosave string uuid;
 // nosave ist wichtig - niemand soll den buffer mit save_value() auslesen
 // koennen!
-nosave struct stored_msg_s *buffer = ({});
+private nosave struct kobold_msg_s *buffer = ({});
 
 protected void create_lw()
 {
@@ -20,9 +20,9 @@
     return uuid;
 }
 
-public struct stored_msg_s *Retrieve()
+public struct kobold_msg_s *Retrieve()
 {
-//    if (getuid(this_object()) == getuid(previous_object()))
+    if (uuid == getuuid(previous_object()))
     {
         return buffer;
     }
@@ -31,7 +31,7 @@
 
 public void Empty()
 {
-//    if (getuid(this_object()) == getuid(previous_object()))
+    if (uuid == getuuid(previous_object()))
     {
         buffer = ({});
     }
@@ -48,7 +48,7 @@
     if (sizeof(buffer) >= MAX_KOBOLD_LIMIT)
         return MSG_BUFFER_FULL;
 
-    buffer += ({ (<stored_msg_s> msg:msg, type:msg_type,
+    buffer += ({ (<kobold_msg_s> msg:msg, type:msg_type,
                   prefix: msg_prefix, action: msg_action,
                   sendername: ({string})origin.query_real_name(),
                   timestamp: time())