diff --git a/SPD-classes/src/main/java/com/watabou/utils/Signal.java b/SPD-classes/src/main/java/com/watabou/utils/Signal.java
index 8bb6ee153..c2d5682f3 100644
--- a/SPD-classes/src/main/java/com/watabou/utils/Signal.java
+++ b/SPD-classes/src/main/java/com/watabou/utils/Signal.java
@@ -68,14 +68,19 @@ public class Signal<T> {
 	
 	public synchronized void dispatch( T t ) {
 
-		canceled = false;
-		for (Listener<T> listener : listeners) {
+		@SuppressWarnings("unchecked")
+		Listener<T>[] list = listeners.toArray( new Listener[0] );
 
-			listener.onSignal( t );
-			if (canceled) {
-				return;
+		canceled = false;
+		for (Listener<T> listener : list) {
+
+			if (listeners.contains(listener)) {
+				listener.onSignal(t);
+				if (canceled) {
+					return;
+				}
 			}
-			
+
 		}
 	}