diff --git a/application/Cpeprovisioning/CpeprovisioningController.php b/application/Cpeprovisioning/CpeprovisioningController.php
index ce7908805..af47a40bb 100644
--- a/application/Cpeprovisioning/CpeprovisioningController.php
+++ b/application/Cpeprovisioning/CpeprovisioningController.php
@@ -36,10 +36,10 @@ class CpeprovisioningController extends mfBaseController {
     $orders = OrderModel::search($order_filter);
     
     foreach($orders as $order) {
-      if($order->finish_after) {
+      if($order_filter["hide_delayed_finish"] && $order->finish_after) {
         // show at most 4 weeks before finish_after date
-        $after_ts = Layout::dateToInt($order->finish_after);
-        if($after_ts > date("U") + (31 * 86400)) {
+        //$after_ts = Layout::dateToInt($order->finish_after);
+        if($order->finish_after > date("U") + (31 * 86400)) {
           $this->log->debug("Before 4 weeks before finish_after oid ".$order->id);
           continue;
         }