--- a/core/modulemanager.lua	Fri May 18 04:24:33 2012 +0100
+++ b/core/modulemanager.lua	Fri May 18 23:53:02 2012 +0100
@@ -91,8 +91,8 @@
 		end
 	end
 	
-	for handler, event in pairs(mod.module.event_handlers) do
-		event.object.remove_handler(event.name, handler);
+	for event, data in pairs(mod.module.event_handlers) do
+		data.object.remove_handler(event, data.handler);
 	end
 	
 	if mod.module.items then -- remove items