diff --git a/fieldservice_recurring/README.rst b/fieldservice_recurring/README.rst
index 610f8fd3a8..8539dc9293 100644
--- a/fieldservice_recurring/README.rst
+++ b/fieldservice_recurring/README.rst
@@ -117,6 +117,7 @@ Contributors
 
 * Brian McMaster <brian@mcmpest.com>
 * Kitti Upariphutthiphone <kittiu@ecosoft.co.th>
+* Rapha??l Reverdy <raphael.reverdy@akretion.com>
 
 Other credits
 ~~~~~~~~~~~~~
diff --git a/fieldservice_recurring/models/fsm_recurring.py b/fieldservice_recurring/models/fsm_recurring.py
index fe94c583e5..1060adf1de 100644
--- a/fieldservice_recurring/models/fsm_recurring.py
+++ b/fieldservice_recurring/models/fsm_recurring.py
@@ -98,8 +98,8 @@ def action_start(self):
         for rec in self:
             if not rec.start_date:
                 rec.start_date = datetime.now()
-            rec._create_order(date=rec.start_date)
             rec.write({'state': 'progress'})
+            rec._generate_orders()
 
     @api.multi
     def action_renew(self):
@@ -119,7 +119,7 @@ def _get_rruleset(self):
         if self.state != 'progress':
             return ruleset
         # set next_date which is used as the rrule 'dtstart' parameter
-        next_date = datetime.now()
+        next_date = self.start_date
         last_order = self.env['fsm.order'].search([
             ('fsm_recurring_id', '=', self.id),
             ('stage_id', '!=', self.env.ref(
@@ -164,18 +164,15 @@ def _create_order(self, date):
         vals = self._prepare_order_values(date)
         return self.env['fsm.order'].create(vals)
 
-    @api.model
-    def _cron_generate_orders(self):
+    @api.multi
+    def _generate_orders(self):
         """
-        Executed by Cron task to create field service orders from any
-        recurring orders which are in progress, or to renew, and up to
-        the max orders allowed by the recurring order
+        create field service orders from self
+        up to the max orders allowed by the recurring order
         @return {recordset} orders: all the order objects created
         """
         orders = self.env['fsm.order']
-        for rec in self.env['fsm.recurring'].search([
-            ('state', 'in', ('progress', 'pending'))
-        ]):
+        for rec in self:
             schedule_dates = rec._get_rruleset()
             order_dates = []
             for order in rec.fsm_order_ids:
@@ -186,11 +183,23 @@ def _cron_generate_orders(self):
             for date in schedule_dates:
                 if date.date() in order_dates:
                     continue
-                if max_orders >= order_count or not max_orders:
-                    orders += rec._create_order(date=date)
+                if max_orders > order_count or not max_orders:
+                    orders |= rec._create_order(date=date)
                     order_count += 1
         return orders
 
+    @api.model
+    def _cron_generate_orders(self):
+        """
+        Executed by Cron task to create field service orders from any
+        recurring orders which are in progress, or to renew, and up to
+        the max orders allowed by the recurring order
+        @return {recordset} orders: all the order objects created
+        """
+        return self.env['fsm.recurring'].search([
+            ('state', 'in', ('progress', 'pending'))
+        ])._generate_orders()
+
     @api.model
     def _cron_manage_expiration(self):
         """
diff --git a/fieldservice_recurring/static/description/index.html b/fieldservice_recurring/static/description/index.html
index fe4d952b68..690d8829c5 100644
--- a/fieldservice_recurring/static/description/index.html
+++ b/fieldservice_recurring/static/description/index.html
@@ -468,6 +468,7 @@ <h2><a class="toc-backref" href="#id8">Contributors</a></h2>
 <ul class="simple">
 <li>Brian McMaster &lt;<a class="reference external" href="mailto:brian&#64;mcmpest.com">brian&#64;mcmpest.com</a>&gt;</li>
 <li>Kitti Upariphutthiphone &lt;<a class="reference external" href="mailto:kittiu&#64;ecosoft.co.th">kittiu&#64;ecosoft.co.th</a>&gt;</li>
+<li>Rapha??l Reverdy &lt;<a class="reference external" href="mailto:raphael.reverdy&#64;akretion.com">raphael.reverdy&#64;akretion.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="other-credits">