diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
index be2fc6a..ca695e2 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -26,7 +26,11 @@
 
       "ShipFrom":
       {
+        <#if receipt.receipt_type == '020'>
+          "ActorID": "${RFXtoRPprefixConsignee(receipt.original_code?trim?json_string)}"
+        <#else>
         "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
+        </#if>
       },
         "ShipTo"  :
       {
diff --git a/VERSION b/VERSION
index fd13e59..5b9ef9c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.39+2
+1.2.40+1