Index: /branches/supervisor/src/main/java/omq/supervisor/SupervisorImpl.java
===================================================================
--- /branches/supervisor/src/main/java/omq/supervisor/SupervisorImpl.java	(revision 93)
+++ /branches/supervisor/src/main/java/omq/supervisor/SupervisorImpl.java	(revision 94)
@@ -91,4 +91,5 @@
 				if (broker.hasObject(reference) && (numObjects - 1) >= minObjects) {
 					broker.deleteObject(reference);
+					break;
 				}
 			}
@@ -96,14 +97,4 @@
 		} catch (Exception io) {
 			// The queue doesn't exist & the channel has been closed
-		}
-
-		for (RemoteBroker broker : brokers) {
-			if (!broker.hasObject(reference) && minObjects >= numObjects) {
-				broker.spawnObject(reference, settings.getClassName(), settings.getProps());
-				numObjects++;
-				if (minObjects >= numObjects) {
-					break;
-				}
-			}
 		}
 	}
Index: /branches/supervisor/src/main/java/omq/supervisor/SupervisorThread.java
===================================================================
--- /branches/supervisor/src/main/java/omq/supervisor/SupervisorThread.java	(revision 93)
+++ /branches/supervisor/src/main/java/omq/supervisor/SupervisorThread.java	(revision 94)
@@ -55,13 +55,14 @@
 		System.out.println("Num Consumers: " + numConsumers + ", num Messages: " + numMessages);
 
-		if (maxMessages < numMessages || minObjects < numConsumers) {
+		if (maxMessages < numMessages || numConsumers < minObjects ) {
 			System.out.println("SPAWN TIME!!");
 			supervisor.spawnObject(settings);
 			// spawn:
-			// pregunta a tots i qui no té l'objecte li poses
-		} else if (numMessages < minMessages && minObjects > numConsumers) {
+			// pregunta a tots i qui no t�� l'objecte li poses
+		} else if (numMessages < minMessages && minObjects < numConsumers) {
+			System.out.println("Unbinding object!!!");
 			supervisor.unbindObject(settings);
 			// delete:
-			// pregunta a tots i qui té l'objecte li treus
+			// pregunta a tots i qui t�� l'objecte li treus
 		}
 	}
Index: /branches/supervisor/src/test/java/omq/test/supervisor/SleepTest.java
===================================================================
--- /branches/supervisor/src/test/java/omq/test/supervisor/SleepTest.java	(revision 93)
+++ /branches/supervisor/src/test/java/omq/test/supervisor/SleepTest.java	(revision 94)
@@ -60,5 +60,5 @@
 		Supervisor supervisor = broker.lookup("supervisor", Supervisor.class);
 
-		OmqSettings settings = new OmqSettings("sleep", SleepImpl.class.getName(), env, 20, 20, 2);
+		OmqSettings settings = new OmqSettings("sleep", SleepImpl.class.getName(), env, 1, 20, 20);
 		supervisor.spawnObject(settings);
 
Index: anches/supervisor/target/classes/log4j.xml
===================================================================
--- /branches/supervisor/target/classes/log4j.xml	(revision 93)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-    <appender name="consoleAppender" class="org.apache.log4j.ConsoleAppender">
-        <param name="Threshold" value="INFO" />
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d{[yyyy-MM-dd HH:mm:ss]} %-5p %c:%L - %m%n" />
-        </layout>
-    </appender>
-
-    <appender class="org.apache.log4j.rolling.RollingFileAppender" name="A2">
-        <param value="true" name="append"/>
-        <param value="logs/objectmq-temp.log" name="File"/>
-
-        <rollingPolicy class="org.apache.log4j.rolling.FixedWindowRollingPolicy">
-            <param name="fileNamePattern" value="logs/objectmq-%i.log" />
-            <param name="MinIndex" value="0"/> 
-            <param name="MaxIndex" value="1"/> 
-        </rollingPolicy>
-        
-        <triggeringPolicy class="org.apache.log4j.rolling.SizeBasedTriggeringPolicy"> 
-            <param name="MaxFileSize" value="10000000"/> 
-        </triggeringPolicy> 
-        
-        <layout class="org.apache.log4j.PatternLayout">
-            <param value="%d{[yyyy-MM-dd HH:mm:ss]} %-5p %c:%L - %m%n" name="ConversionPattern"/>
-        </layout>        
-    </appender>
-
-  <root> 
-    <priority value ="INFO" /> 
-    <appender-ref ref="consoleAppender" />
-    <appender-ref ref="A2" />  
-  </root>
-  
-</log4j:configuration>