--- a/core/moduleapi.lua	Wed May 06 19:00:05 2015 +0100
+++ b/core/moduleapi.lua	Wed May 06 19:01:16 2015 +0100
@@ -94,6 +94,7 @@
 end
 
 function api:unhook_object_event(object, event, handler)
+	self.event_handlers:set(object, event, handler, nil);
 	return object.remove_handler(event, handler);
 end