diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl
index 3d272fb..3616f05 100644
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -44,8 +44,9 @@
 			"apt_with_end_consignee": "${apt_with_end_consignee_flag}",
 			"apt_with_intermediate": "false",
 			"load_grouping": "${load_grouping}"
-		  	},
+		  	}
 		<#if actorID == defaultactor >
+		,
 			"address": {
 				"type_code": "${typecode}",
 				"title_code" : "${titlecode}",
@@ -66,9 +67,10 @@
 				"postal_code": "${executionflow.ShipTo.Actor.Address.PostalCode!""}",
 				"post_code_area_name" : "${executionflow.ShipTo.Actor.Address.City!""}",
 				"iso_country_code": "${executionflow.ShipTo.Actor.Address.CountryCode!""}"
-			},
+			}
 		</#if>
 		<#if executionflow.Lines??>
+		 ,
 			"line_list": [
 			<#list executionflow.Lines as line>
 				<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
@@ -100,7 +102,8 @@
 				}
 			<#sep>,</#sep>
 			</#list>
+			]
 		</#if>
-		]
+
 	 }
  }
diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl
index 5cf790e..2125ae5 100644
--- a/RPtoRFX_Receipt.ftl
+++ b/RPtoRFX_Receipt.ftl
@@ -25,9 +25,10 @@
 		</#if>
 		"carrier_appointment_made": "false",
 		"receipt_in_cross_docking": "false",
-		"dock_occupation_duration": 1,
+		"dock_occupation_duration": 1
 		  
 		<#if executionflow.Lines??> 
+		,
 			"line_list": [
 			<#list executionflow.Lines as line>
 
@@ -61,7 +62,6 @@
 			}<#sep>,</#sep>
 		</#list> 	     	
 		]
-		</#if>
-		  
+		</#if>		  
 	 }
  }