diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php
index 7923889fb..85e8f6f24 100644
--- a/airtime_mvc/application/models/Scheduler.php
+++ b/airtime_mvc/application/models/Scheduler.php
@@ -595,10 +595,9 @@ class Application_Model_Scheduler
                         ->filterByDbStarts(gmdate("Y-m-d H:i:s"), Criteria::GREATER_THAN)
                         ->find();
                 } else {
-                    $instance_sql = "SELECT * FROM cc_show_instances ".
-                        "WHERE id = ".$schedule["instance"];
-                    $instances = Application_Common_Database::prepareAndExecute(
-                        $instance_sql);
+                    $instances = CcShowInstancesQuery::create()
+                        ->filterByDbId($schedule["instance"])
+                        ->find();
                 }
 
                 $excludePositions = array();
diff --git a/airtime_mvc/tests/application/models/unit/ScheduleUnitTest.php b/airtime_mvc/tests/application/models/unit/ScheduleUnitTest.php
index d645b545e..63bc8b283 100644
--- a/airtime_mvc/tests/application/models/unit/ScheduleUnitTest.php
+++ b/airtime_mvc/tests/application/models/unit/ScheduleUnitTest.php
@@ -22,7 +22,7 @@ class ScheduleUnitTest extends Zend_Test_PHPUnit_ControllerTestCase //PHPUnit_Fr
         
     }
 
-    /*public function testIsFileScheduledInTheFuture()
+    public function testIsFileScheduledInTheFuture()
     {
         TestHelper::loginUser();
         $CC_CONFIG = Config::getConfig();
@@ -92,6 +92,6 @@ class ScheduleUnitTest extends Zend_Test_PHPUnit_ControllerTestCase //PHPUnit_Fr
         
         //Test the function we actually want to test. :-)
         $this->assertEquals($scheduleModel->IsFileScheduledInTheFuture($fileId), true);
-    }*/
+    }
 }