diff --git a/src/base/bt/map.py b/src/base/bt/map.py
index 1145637b..68a37c54 100644
--- a/src/base/bt/map.py
+++ b/src/base/bt/map.py
@@ -7,9 +7,6 @@ __author__="bjschuma"
 __date__ ="$Jan 19, 2010 11:10:07 PM$"
 
 
-from collections import deque
-
-
 class Map(dict):
 	def __init__(self):
 		dict.__init__(self)
@@ -46,8 +43,9 @@ class Map(dict):
 			return
 
 		items = self.get(key,True)
-		if (item in items) == True:
-			items.remove(item)
+		for tuple in items:
+			if tuple[1]==item:
+				items.remove(tuple)
 
 
 	def delete(self,key):
diff --git a/src/base/bt/signal.py b/src/base/bt/signal.py
index 9a32a2af..6dc47585 100644
--- a/src/base/bt/signal.py
+++ b/src/base/bt/signal.py
@@ -20,6 +20,7 @@ def register(signal,func,priority=100):
 
 
 def remove(signal,func):
+	global signals
 	signals.remove(signal,func)