diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl
index 1781f53..eef8a4a 100644
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -74,7 +74,6 @@
                }
             </#if>
                </#list>
-            <#--  <#sep>,</#sep> -->
             </#list>
          ]
    <#else>
diff --git a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
index 5589f60..b36dab6 100644
--- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
@@ -3,7 +3,8 @@
 [
 <#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?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg2>
+    <#list preparation_line2.despatched_ipg_list as despatched_ipg2>
+    <#if despatched_ipg2.carton_number!="000000000000000000">
     {
     "Header": {
       "ProjectID": "${projectRP}"
@@ -20,4 +21,5 @@
       </#list>
   <#sep>,</#sep>
   </#list>
+  <#if>
 ]