diff --git a/TDItoRP.ftl b/TDItoRP.ftl
index 62298c5..e17ea73 100644
--- a/TDItoRP.ftl
+++ b/TDItoRP.ftl
@@ -42,13 +42,13 @@
 			   <#if tdiEvent.EventCode?starts_with("D-") == true ||
 					tdiEvent.EventCode == "OK-DELIVERED" ||
 				   tdiEvent.EventCode == "OK-WITHDRAWA" >
-			  "Code": "TRACKING_EVENT_IFTSTA_14",<#-- Process Completed  -->
+			  "Code": "TRACKING_EVENT_IFTSTA_21",<#-- Process Completed  -->
 			  <#else>
 			   <#if tdiEvent.EventCode?starts_with("DC") == true ||
 					tdiEvent.EventCode?starts_with("DN") == true ||
 					tdiEvent.EventCode?starts_with("DR") == true ||
 					tdiEvent.EventCode == "NEX" >
-			  "Code": "TRACKING_EVENT_IFTSTA_21",<#-- Delivery completed  -->
+			  "Code": "TRACKING_EVENT_IFTSTA_14",<#-- Delivery completed  -->
 			  <#else>
 			  "Code": "TRACKING_EVENT_UNKNOWN",
 			   </#if>
diff --git a/VERSION b/VERSION
index e91986d..9441ead 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.14+1
+2.0.15+1