Index: branches/supervisor/src/main/java/omq/common/broker/Broker.java
===================================================================
--- branches/supervisor/src/main/java/omq/common/broker/Broker.java	(revision 94)
+++ branches/supervisor/src/main/java/omq/common/broker/Broker.java	(revision 95)
@@ -266,4 +266,5 @@
 			RemoteObject remote = remoteObjs.get(reference);
 			remote.kill();
+			remoteObjs.remove(reference);
 		} else {
 			throw new RemoteException("The object referenced by 'reference' does not exist in the Broker");
Index: branches/supervisor/src/test/java/omq/test/supervisor/SleepImpl.java
===================================================================
--- branches/supervisor/src/test/java/omq/test/supervisor/SleepImpl.java	(revision 94)
+++ branches/supervisor/src/test/java/omq/test/supervisor/SleepImpl.java	(revision 95)
@@ -16,5 +16,5 @@
 		try {
 			System.out.println("I'm going to sleep!!!!!!!!" + Thread.currentThread().getId());
-			Thread.sleep(3000);
+			Thread.sleep(1000);
 		} catch (InterruptedException e) {
 			e.printStackTrace();
Index: branches/supervisor/src/test/java/omq/test/supervisor/SleepTest.java
===================================================================
--- branches/supervisor/src/test/java/omq/test/supervisor/SleepTest.java	(revision 94)
+++ branches/supervisor/src/test/java/omq/test/supervisor/SleepTest.java	(revision 95)
@@ -72,4 +72,8 @@
 			sleep.sleep();
 		}
+		Thread.sleep(18000);
+		for (int i = 0; i < 20; i++) {
+			sleep.sleep();
+		}
 
 		Thread.sleep(100000);