diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
index bd37d45..53f554a 100644
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -57,7 +57,7 @@
               "Address" :
                 {
                  "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
-                 <#assign isCountryCode = JsonUtil.isCountryCode(actor.supplier_structured_address.country_code?upper_case) />
+                 <#assign isCountryCode = JsonUtil.isCountryCode(preparation_order.address.iso_country_code?upper_case) />
                  <#if isCountryCode>
                  "CountryCode" : "${(preparation_order.address.iso_country_code!"")?json_string}",
                  <#else>