--- a/util/events.lua	Sat Dec 18 14:46:28 2010 +0000
+++ b/util/events.lua	Sun Dec 19 00:53:19 2010 +0500
@@ -45,6 +45,9 @@
 		if map then
 			map[handler] = nil;
 			handlers[event] = nil;
+			if next(map) == nil then
+				event_map[event] = nil;
+			end
 		end
 	end;
 	local function add_handlers(handlers)