diff --git a/secure/questmaster.c b/secure/questmaster.c
index e63b296..9007460 100644
--- a/secure/questmaster.c
+++ b/secure/questmaster.c
@@ -78,7 +78,7 @@
                      string taskdesc, int vis, int active, string title,
                      string donedesc, mapping restr, string domain, 
                      string *permitted_objs) {
-  by_num += ([ index : ({stupse, mqob_name})]);
+  m_add(by_num, index, ({stupse, mqob_name}));
   foreach ( string obj: permitted_objs ) {
     if ( member(mq_query_permitted, obj) )
       mq_query_permitted[obj] += ({mqob_name});
@@ -87,13 +87,19 @@
   }
 }
 
+private void RebuildMQCache() {
+  by_num = ([]);
+  mq_query_permitted = ([]);
+  walk_mapping(miniquests, #'make_num /*'*/ );
+}
+
 void create() {
   seteuid(getuid(ME));
   if (!restore_object(QUESTS)) {
     save_info();
   }
 
-  walk_mapping(miniquests, #'make_num /*'*/ );
+  RebuildMQCache();
   set_next_reset(43200); // Reset alle 12 Stunden.
   EVENTD->RegisterEvent(EVT_LIB_QUEST_SOLVED,"HandleQuestSolved",
       ME);
@@ -118,7 +124,7 @@
 void reset() {
   by_num = ([]);
   mq_query_permitted = ([]);
-  walk_mapping(miniquests, #'make_num /*'*/ );
+  RebuildMQCache();
   set_next_reset(43200);
 }
 
@@ -564,6 +570,7 @@
     return 0;
 
   users_mq = ([]);
+  RebuildMQCache();
 
   return 1;
 }