diff --git a/macosx/Controller.m b/macosx/Controller.m
index cf53ebfaa..8086b71e0 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -2778,7 +2778,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
         Torrent * torrent;
         NSEnumerator * enumerator = [fTorrents objectEnumerator];
         while ((torrent = [enumerator nextObject]))
-            if ([torrent isPaused] && ![torrent waitingToStart])
+            if (![torrent isActive] && ![torrent waitingToStart])
                 return YES;
         return NO;
     }
@@ -2800,7 +2800,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
         NSEnumerator * enumerator = [[fDisplayedTorrents objectsAtIndexes: [fTableView selectedRowIndexes]] objectEnumerator];
         Torrent * torrent;
         while ((torrent = [enumerator nextObject]))
-            if ([torrent isPaused] && ![torrent waitingToStart])
+            if (![torrent isActive] && ![torrent waitingToStart])
                 return YES;
         return NO;
     }
@@ -2927,7 +2927,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
         Torrent * torrent;
         NSEnumerator * enumerator = [fTorrents objectEnumerator];
         while ((torrent = [enumerator nextObject]))
-            if ([torrent isPaused] && ![torrent waitingToStart])
+            if (![torrent isActive] && ![torrent waitingToStart])
                 return YES;
         return NO;
     }
@@ -2941,7 +2941,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
         Torrent * torrent;
         NSEnumerator * enumerator = [fTorrents objectEnumerator];
         while ((torrent = [enumerator nextObject]))
-            if ([torrent isPaused] && [torrent waitingToStart])
+            if (![torrent isActive] && [torrent waitingToStart])
                 return YES;
         return NO;
     }
@@ -2955,7 +2955,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
         NSEnumerator * enumerator = [[fDisplayedTorrents objectsAtIndexes: [fTableView selectedRowIndexes]] objectEnumerator];
         Torrent * torrent;
         while ((torrent = [enumerator nextObject]))
-            if ([torrent isPaused])
+            if (![torrent isActive])
                 return YES;
         return NO;
     }
@@ -2983,7 +2983,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
         NSEnumerator * enumerator = [[fDisplayedTorrents objectsAtIndexes: [fTableView selectedRowIndexes]] objectEnumerator];
         Torrent * torrent;
         while ((torrent = [enumerator nextObject]))
-            if ([torrent isPaused] && ![torrent waitingToStart])
+            if (![torrent isActive] && ![torrent waitingToStart])
                 return YES;
         return NO;
     }
@@ -3055,7 +3055,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
             
             enumerator = [fTorrents objectEnumerator];
             while (!timeUp && (torrent = [enumerator nextObject]))
-                while (![torrent isPaused] && !(timeUp = [start timeIntervalSinceNow] < -5.0))
+                while ([torrent isActive] && !(timeUp = [start timeIntervalSinceNow] < -5.0))
                 {
                     usleep(100000);
                     [torrent update];
diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index ab11dfb7b..0fb49e31d 100644
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -1345,13 +1345,13 @@ typedef enum
     enumerator = [fTorrents objectEnumerator];
     torrent = [enumerator nextObject]; //first torrent
     
-    BOOL pexEnabled = ![torrent privateTorrent] && [torrent isPaused];
+    BOOL pexEnabled = ![torrent privateTorrent] && ![torrent isActive];
     int pexState = [torrent pex] ? NSOnState : NSOffState;
     
     while ((torrent = [enumerator nextObject]) && (pexEnabled || pexState != NSMixedState))
     {
         if (pexEnabled)
-            pexEnabled = ![torrent privateTorrent] && [torrent isPaused];
+            pexEnabled = ![torrent privateTorrent] && ![torrent isActive];
         
         if (pexState != NSMixedState && pexState != ([torrent pex] ? NSOnState : NSOffState))
             pexState = NSMixedState;
diff --git a/macosx/Torrent.h b/macosx/Torrent.h
index f2335d963..483afc0aa 100644
--- a/macosx/Torrent.h
+++ b/macosx/Torrent.h
@@ -158,7 +158,6 @@ typedef enum
 
 - (BOOL) isActive;
 - (BOOL) isSeeding;
-- (BOOL) isPaused;
 - (BOOL) isChecking;
 - (BOOL) allDownloaded;
 - (BOOL) isComplete;
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index a055ea672..44e7624a2 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -729,7 +729,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
 
 - (BOOL) isActive
 {
-    return fStat->status & TR_STATUS_ACTIVE;
+    return fStat->status != TR_STATUS_STOPPED;
 }
 
 - (BOOL) isSeeding
@@ -737,11 +737,6 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
     return fStat->status == TR_STATUS_SEED || fStat->status == TR_STATUS_DONE;
 }
 
-- (BOOL) isPaused
-{
-    return fStat->status == TR_STATUS_STOPPED;
-}
-
 - (BOOL) isChecking
 {
     return fStat->status == TR_STATUS_CHECK || fStat->status == TR_STATUS_CHECK_WAIT;
diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m
index 717231517..dd68cd20a 100644
--- a/macosx/TorrentTableView.m
+++ b/macosx/TorrentTableView.m
@@ -158,7 +158,7 @@
         
         if ([torrent isActive])
             [fController stopTorrents: [NSArray arrayWithObject: torrent]];
-        else if ([torrent isPaused])
+        else
         {
             if ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask)
                 [fController resumeTorrentsNoWait: [NSArray arrayWithObject: torrent]];
@@ -167,7 +167,6 @@
             else
                 [fController resumeTorrents: [NSArray arrayWithObject: torrent]];
         }
-        else;
     }
     else if (row == oldRow && [self pointInRevealRect: point] && [self pointInRevealRect: fClickPoint])
         [[fTorrents objectAtIndex: row] revealData];
@@ -460,7 +459,7 @@
     NSRect pauseRect  = [self pauseRectForRow: row];
     if ([torrent isActive])
         pauseImage = fClickIn && NSPointInRect(fClickPoint, pauseRect) ? fPauseOnIcon : fPauseOffIcon;
-    else if ([torrent isPaused])
+    else
     {
         BOOL inPauseRect = fClickIn && NSPointInRect(fClickPoint, pauseRect);
         if ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask && [fDefaults boolForKey: @"Queue"])
@@ -470,7 +469,6 @@
         else
             pauseImage = inPauseRect ? fResumeOnIcon : fResumeOffIcon;
     }
-    else;
     
     if (pauseImage)
         [pauseImage compositeToPoint: NSMakePoint(pauseRect.origin.x, NSMaxY(pauseRect)) operation: NSCompositeSourceOver];