diff --git a/src/Event.cpp b/src/Event.cpp
index 1af04cf..5c8bf06 100644
--- a/src/Event.cpp
+++ b/src/Event.cpp
@@ -3,20 +3,22 @@
 Event::Event(){}
 Event::~Event(){}
 void Event::add(Input* input, TypedInputHandler handler){
-	int pos = position(handler);
+	int pos = position(input, handler);
 	if(pos != -1) return;
 	typedInputs.push(input);
 	typedInputHandlers.push(handler);
 }
-void Event::remove(TypedInputHandler handler){
-	int pos = position(handler);
+void Event::remove(Input* input, TypedInputHandler handler){
+	int pos = position(input, handler);
 	if(pos == -1) return;
 	typedInputs.erase(pos);
 	typedInputHandlers.erase(pos);
 }
-int Event::position(TypedInputHandler handler){
+int Event::position(Input* input, TypedInputHandler handler){
 	for(int i=0; i<typedInputHandlers.size(); i++){
-		if(typedInputHandlers[i] == handler) return i;
+		if(typedInputs[i] == input && typedInputHandlers[i] == handler) {
+			return i;
+		}
 	}
 	return -1;
 }
diff --git a/src/Event.h b/src/Event.h
index f01d04d..53b4bf5 100644
--- a/src/Event.h
+++ b/src/Event.h
@@ -14,11 +14,11 @@ class Event {
 	typedef void (Input::*TypedInputHandler)(float value);
 
 	void add(Input* input, TypedInputHandler handler);
-	void remove(TypedInputHandler handler);
+	void remove(Input* input, TypedInputHandler handler);
 	void dispatch(float &value);
 
 	private:
-	int position(TypedInputHandler handler);
+	int position(Input* input, TypedInputHandler handler);
 
 	VectorTypedInputHandler typedInputHandlers;
 	VectorInputsPointer typedInputs;
diff --git a/src/Input.cpp b/src/Input.cpp
index d592703..2dc50e4 100644
--- a/src/Input.cpp
+++ b/src/Input.cpp
@@ -55,7 +55,7 @@ void Input::onOutputChange(float value){
 }
 void Input::clearOutput(){
 	if(output){
-		output->event.remove(&Input::onOutputChange);
+		output->event.remove(this, &Input::onOutputChange);
 		output = NULL;
 	}
 }