diff --git a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
index bcf2cd3..f2b17d4 100644
--- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
@@ -8,11 +8,11 @@
 		"TimeZone":"${time_zone_rfx}",
 		 <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false">
 		   <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_RECEPTION>  
-		   <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_unloading_end_datetime?datetime.iso,time_zone_rfx) />			   
+		   <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_unloading_end_datetime?datetime.iso) />			   
 		<#else>
 			<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" >
 				<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_EXPEDITION>
-				<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_load_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso,time_zone_rfx) />
+				<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_load_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) />
 			<#else>
 				<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
 					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_BOTH>
@@ -58,9 +58,9 @@
 				<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true">
 					"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
 				<#else>
-				    <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_start_datetime?datetime.iso,time_zone_rfx) />
+				    <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_start_datetime?datetime.iso) />
 					<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">					
-						<#if duration >= 0>
+						<#if (duration >= 0) >
 							"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
 						<#else>
 							"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
diff --git a/RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl
index 1c76b5d..86a3422 100644
--- a/RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl
@@ -57,7 +57,7 @@
 				<#else>
 				    <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_start_datetime?datetime.iso) />
 					<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">					
-						<#if duration >= 0>
+						<#if (duration >= 0) >
 							"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
 						<#else>
 							"StartDateTime": "${carrier_apt.planned_load_start_datetime}"