diff --git a/modules.c b/modules.c
index 031ef7487..0ed7507fc 100644
--- a/modules.c
+++ b/modules.c
@@ -1264,7 +1264,9 @@ void moduleCallBackRun(void)
         if (debug)
             alog("Executing callback: %s", tmp->name ? tmp->name : "?");
         if (tmp->func) {
+            mod_current_module_name = tmp->owner_name;
             tmp->func(tmp->argc, tmp->argv);
+            mod_current_module = NULL;
             moduleCallBackDeleteEntry(NULL);    /* delete the head */
         }
     }
diff --git a/version.log b/version.log
index c475f37b6..fabfc6f0c 100644
--- a/version.log
+++ b/version.log
@@ -8,11 +8,16 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="0"
-VERSION_BUILD="11"
+VERSION_BUILD="12"
 VERSION_EXTRA=""
 
 # $Log$
 #
+# BUILD : 1.7.0 (12)
+# BUGS  : 5
+# NOTES : Fixed a bug with module callbacks, this is a tiny fix, but will need to be merged with the 1.6.x series, as it can cause a segfault if a module attempts to use recersive callbacks.
+# 
+#
 # BUILD : 1.7.0 (11)
 # BUGS  : 
 # NOTES : Added channelname to entrymsgs