diff --git a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
index 5b1e9111f38a..6364c7c5488b 100644
--- a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
+++ b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
@@ -54,7 +54,7 @@ class UpdateRecurringInvoiceRequest extends Request
     protected function prepareForValidation()
     {
         $input = $this->all();
-        info($input);
+
         if (array_key_exists('design_id', $input) && is_string($input['design_id'])) {
             $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
         }
diff --git a/app/Models/RecurringInvoice.php b/app/Models/RecurringInvoice.php
index 70a9795c89c6..1c4e827102b0 100644
--- a/app/Models/RecurringInvoice.php
+++ b/app/Models/RecurringInvoice.php
@@ -44,20 +44,8 @@ class RecurringInvoice extends BaseModel
     const STATUS_PENDING = -1;
 
     /**
-     * Recurring intervals //todo MAP WHEN WE MIGRATE.
+     * Invoice Frequencies.
      */
-
-    /* Make sure we support overflow!!!!!!!!!!
-    $start = Carbon::today();
-    $subscription = Carbon::parse('2017-12-31');
-
-    foreach (range(1, 12) as $month) {
-        $day = $start->addMonthNoOverflow()->thisDayOrLast($subscription->day);
-
-        echo "You will be billed on {$day} in month {$month}\n";
-    }
-     */
-
     const FREQUENCY_DAILY = 1;
     const FREQUENCY_WEEKLY = 2;
     const FREQUENCY_TWO_WEEKS = 3;
diff --git a/app/Services/Recurring/RecurringService.php b/app/Services/Recurring/RecurringService.php
index a6cd1394cd72..7cbfa0e8b163 100644
--- a/app/Services/Recurring/RecurringService.php
+++ b/app/Services/Recurring/RecurringService.php
@@ -49,8 +49,11 @@ class RecurringService
     public function start()
     {
     	//make sure next_send_date is either now or in the future else return.
-    	if(Carbon::parse($this->recurring_entity->next_send_date)->lt(now()))
-    		return $this;
+    	// if(Carbon::parse($this->recurring_entity->next_send_date)->lt(now()))
+    	// 	return $this;
+
+        if($this->recurring_entity->remaining_cycles == 0)
+            return $this;
 
     	$this->recurring_entity->status_id = RecurringInvoice::STATUS_ACTIVE;