diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl
index 6214c0a..41434b1 100644
--- a/RPtoRFX_AppointmentEvent.ftl
+++ b/RPtoRFX_AppointmentEvent.ftl
@@ -37,7 +37,7 @@
 		}
 		<#else>
 			<#if eventRP.commissionsUpdated>
-			    <#if appointment.executionflowCustomFields?has_content>
+			    <#if eventRP.executionflowCustomFields?has_content>
 					<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.addedUnloadCommissions?? && eventRP.addedUnloadCommissions != "">
 						<#if eventRP.appointmentCustomFields?has_content>
 						{
@@ -80,7 +80,7 @@
 					</#if>
 				</#if>
 
-				<#if appointment.orderCustomFields?has_content>
+				<#if eventRP.orderCustomFields?has_content>
 					<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.addedUnloadCommissions?? && eventRP.addedUnloadCommissions != "">
 						<#if AddComma == true>
 							,