diff --git a/VERSION b/VERSION
index d0eec140..5040eda2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-20 19:38:48) dev
+Version 2.1.1 (2012-10-21 09:23:20) dev
diff --git a/gluon/scheduler.py b/gluon/scheduler.py
index 0495d01c..fb6d5841 100644
--- a/gluon/scheduler.py
+++ b/gluon/scheduler.py
@@ -789,7 +789,7 @@ class Scheduler(MetaScheduler):
         db(st.status.belongs(
             (QUEUED, ASSIGNED)))(st.stop_time < now).update(status=EXPIRED)
 
-        all_available = db(st.status.belongs((QUEUED, ASSIGNED)))((st.times_run < st.repeats) | (st.repeats == 0))(st.start_time <= now)((st.stop_time is None) | (st.stop_time > now))(st.next_run_time <= now)(st.enabled == True)
+        all_available = db(st.status.belongs((QUEUED, ASSIGNED)))((st.times_run < st.repeats) | (st.repeats == 0))(st.start_time <= now)((st.stop_time == None) | (st.stop_time > now))(st.next_run_time <= now)(st.enabled == True)
         limit = len(all_workers) * (50 / len(wkgroups))
         #if there are a moltitude of tasks, let's figure out a maximum of tasks per worker.
         #this can be adjusted with some added intelligence (like esteeming how many tasks will
@@ -805,7 +805,7 @@ class Scheduler(MetaScheduler):
         #let's freeze it up
         db.commit()
         for group in wkgroups.keys():
-            tasks = all_available(st.group_name == group).select(
+            tasks = all_available(st.group_name==group).select(
                 limitby=(0, limit), orderby=st.next_run_time)
             #let's break up the queue evenly among workers
             for task in tasks: