diff --git a/macosx/Controller.m b/macosx/Controller.m
index 5fa2f02e2..4fd5161ee 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -1039,8 +1039,7 @@ static void sleepCallBack(void * controller, io_service_t y,
 
 - (void) torrentStartSettingChange: (NSNotification *) notification
 {
-    Torrent * torrent = [notification object];
-    [self attemptToStartAuto: torrent];
+    [self attemptToStartAuto: [notification object]];
 
     [self updateUI: nil];
     [self updateTorrentHistory];
@@ -1050,7 +1049,6 @@ static void sleepCallBack(void * controller, io_service_t y,
 - (void) attemptToStartAuto: (Torrent *) torrent
 {
     #warning should check if transfer was already done
-    NSLog([torrent name]);
     if (![torrent waitingToStart])
             return;
     
diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index cbafcecb3..2bf688d41 100644
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -471,10 +471,9 @@
 
 - (void) setWaitToStart: (id) sender
 {
-    Torrent * torrent;
-    NSEnumerator * enumerator = [fTorrents objectEnumerator];
-    while ((torrent = [enumerator nextObject]))
-        [torrent setWaitToStart: [sender state]];
+    #warning make work with multiples
+    Torrent * torrent = [fTorrents objectAtIndex: 0];
+    [torrent setWaitToStart: [sender state]];
     
     [[NSNotificationCenter defaultCenter] postNotificationName: @"TorrentStartSettingChange" object: torrent];
 }