diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl
index cbea0cb..b086d39 100644
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -64,7 +64,7 @@
                <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
                }
             </#if>
-            <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number && despatched_ipg.consignment_unit_id="" >
+            <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
                ,
                {
                <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded>
@@ -78,7 +78,7 @@
                "datas" :
                <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
                }
-               <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? >
+               <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && despatched_ipg.consignment_unit_id="">
                <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
                ,
                {