diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_splitAndDefer.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_splitAndDefer.xml
index 191eabd271f8f339c9272857c0b0055efd0fbf0e..21b484e44f91957400ab09bfd77c0c1f75466999 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_splitAndDefer.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_splitAndDefer.xml
@@ -60,6 +60,7 @@ start_date = state_change[\'kwargs\'][\'start_date\']\n
 stop_date = state_change[\'kwargs\'][\'stop_date\']\n
 \n
 if not len(split_movement_list):\n
+  delivery.updateCausalityState()\n
   return\n
 \n
 tag = delivery.getPath() + \'_split\'\n
@@ -72,7 +73,8 @@ for movement in split_movement_list:\n
     movement, None, \'SplitAndDefer\', start_date=start_date,\n
     stop_date=stop_date, activate_kw={\'tag\':tag})\n
 \n
-delivery.activate().updateCausalityState()\n
+delivery.activate(after_tag=tag).updateCausalityState()\n
+\n
 # Create delivery\n
 explanation_uid_list = []\n
 object = delivery\n
@@ -84,7 +86,7 @@ previous_tag = None\n
 for delivery_builder in delivery.getBuilderList():\n
   this_builder_tag = \'%s_split_%s\' % (delivery.getPath(),\n
                                       delivery_builder.getId())\n
-  after_tag = [tag]\n
+  all_tag_list.append(this_builder_tag)\n
   if previous_tag:\n
     after_tag.append(previous_tag)\n
   delivery_builder.activate(activity=\'SQLQueue\',\n
@@ -145,6 +147,7 @@ for delivery_builder in delivery.getBuilderList():\n
                             <string>previous_tag</string>
                             <string>delivery_builder</string>
                             <string>this_builder_tag</string>
+                            <string>all_tag_list</string>
                             <string>after_tag</string>
                           </tuple>
                         </value>
diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision
index 06834d4380c79b7a19421ace4adf19483fd318f3..9ecf271983f3ae6d3519c5a189b10c5c576db411 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-657
\ No newline at end of file
+660
\ No newline at end of file