diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
index a13e15e..cbdc3be 100644
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -35,10 +35,10 @@
         },
        "ShipFromAcked": true,
          "ShipTo": {
-          <#if preparation_order.transfer_intermediate_consignee?? && preparation_order.transfer_intermediate_consignee == true && preparation_order.intermediate_consignee_transfer_physical_depot?? && preparation_order.intermediate_consignee_transfer_physical_depot!="">
+          <#if preparation_order.intermediate_consignee_transfer_physical_depot?? && preparation_order.intermediate_consignee_transfer_physical_depot!="">
             "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_transfer_physical_depot?json_string)}"
           <#else>
-            <#if preparation_order.intermediate_consignee_transfer_physical_depot?? && preparation_order.intermediate_consignee_transfer_physical_depot="" && preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="">
+            <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="">
               "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_code?json_string)}"
             <#else>
               <#if preparation_order.preparation_type_code == "030">