diff --git a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
index c092c9d..d8e06d9 100644
--- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
@@ -3,8 +3,7 @@
 [
 <#assign dispatched_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
   <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line2>
-    <#list preparation_line2.despatched_ipg_list as despatched_ipg2>
-    <#if despatched_ipg2.carton_number!="000000000000000000">
+    <#list preparation_line2.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg2>
     {
     "Header": {
       "ProjectID": "${projectRP}"
@@ -17,10 +16,10 @@
       }
       },
       "Payload": { }
-      }
-      </#if>
-      <#sep>,</#sep>
+      }<#sep>,</#sep>
       </#list>
+  <#if preparation_line2.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000")?size!=0 >
   <#sep>,</#sep>
+  </#if>
   </#list>
 ]