diff --git a/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn b/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn
index 805883b4..ad20511e 100644
--- a/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn
+++ b/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn
@@ -745,7 +745,10 @@ else:
 if not(invoice.isTeamLeadApprove):
     task_id = "waku_invoice_rejected-Team_Lead"
 else:
-    task_id = "waku_invoice_rejected-Finance"</bpmn:script>
+    task_id = "waku_invoice_rejected-Finance"
+
+# Set Message should not be set
+isSetMessage = False</bpmn:script>
       </bpmn:scriptTask>
       <bpmn:sequenceFlow id="Flow_1d0phao" sourceRef="Activity_03duc95" targetRef="waku_invoice_rejected" />
       <bpmn:scriptTask id="Activity_03duc95" name="Set Message" scriptFormat="python">
@@ -1478,16 +1481,16 @@ else:
       <bpmndi:BPMNShape id="Event_0xohu5m_di" bpmnElement="Event_0xohu5m">
         <dc:Bounds x="832" y="192" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0sjnk6j_di" bpmnElement="Activity_1mndvag">
-        <dc:Bounds x="340" y="170" width="100" height="80" />
+      <bpmndi:BPMNShape id="BPMNShape_0pcr7bl" bpmnElement="Activity_1fsffcq">
+        <dc:Bounds x="680" y="170" width="100" height="80" />
+        <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_17rdv3g_di" bpmnElement="Call_Waku_Messages_Message">
         <dc:Bounds x="510" y="170" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_0pcr7bl" bpmnElement="Activity_1fsffcq">
-        <dc:Bounds x="680" y="170" width="100" height="80" />
-        <bpmndi:BPMNLabel />
+      <bpmndi:BPMNShape id="Activity_0sjnk6j_di" bpmnElement="Activity_1mndvag">
+        <dc:Bounds x="340" y="170" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_0h40vf3_di" bpmnElement="Flow_0h40vf3">
         <di:waypoint x="298" y="210" />