diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl
index 09d525d..f55bfbb 100644
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -54,7 +54,7 @@
 			<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
 			</#if>
 			<#if line.RequestedContent.Goods.SegmentationKeys??>
-			<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(execution.line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
+			<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
 			</#if>
 			<#include "RPtoRFX_PrepOrder_DefaultLineData.ftl">
 		{
diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl
index 534bf02..4fa8873 100644
--- a/RPtoRFX_Receipt.ftl
+++ b/RPtoRFX_Receipt.ftl
@@ -67,7 +67,7 @@
 
 			}<#sep>,</#sep>
 		</#list> 	     	
-		],
+		]
 		</#if>
 		  
 	 }