diff --git a/macosx/Controller.m b/macosx/Controller.m
index d4aae39d2..f66531405 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -1266,23 +1266,14 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
             == (offHour = [fDefaults integerForKey: @"SpeedLimitAutoOffHour"]))
         return;
     
-    BOOL rangeForOn = onHour < offHour;
-    int min, max;
-    if (rangeForOn)
-    {
-        min = onHour;
-        max = offHour;
-    }
-    else
-    {
-        min = offHour;
-        max = onHour;
-    }
-    
+    BOOL shouldBeOn;
     int hour = [[NSCalendarDate calendarDate] hourOfDay];
-    BOOL inRange = hour >= min && hour < max;
+    if (onHour < offHour)
+        shouldBeOn = hour >= onHour && hour < offHour;
+    else
+        shouldBeOn = hour < offHour || hour >= onHour;
     
-    if ((!fSpeedLimitEnabled && (rangeForOn == inRange)) || (fSpeedLimitEnabled && (rangeForOn != inRange)))
+    if ((!fSpeedLimitEnabled && shouldBeOn) || (fSpeedLimitEnabled && !shouldBeOn))
     {
         [self toggleSpeedLimit: nil];
         
diff --git a/macosx/English.lproj/PrefsWindow.nib/info.nib b/macosx/English.lproj/PrefsWindow.nib/info.nib
index 5be50fb3e..d9068cacb 100644
--- a/macosx/English.lproj/PrefsWindow.nib/info.nib
+++ b/macosx/English.lproj/PrefsWindow.nib/info.nib
@@ -7,7 +7,7 @@
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>153</key>
-		<string>119 348 584 311 0 0 1152 842 </string>
+		<string>285 423 582 311 0 0 1152 842 </string>
 		<key>28</key>
 		<string>58 372 582 290 0 0 1152 842 </string>
 		<key>41</key>
diff --git a/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib b/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib
index 05006ac2e..aa982d3be 100644
Binary files a/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib and b/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib differ