diff --git a/workflow/engine/classes/class.xpdl.php b/workflow/engine/classes/class.xpdl.php
index 85bc84953..0ffe6a917 100644
--- a/workflow/engine/classes/class.xpdl.php
+++ b/workflow/engine/classes/class.xpdl.php
@@ -3523,7 +3523,7 @@ class Xpdl extends processes
             $positionY=$coordinateY+55;
             if($idTask != $taskEvaluate){
               $taskEvaluate  = $idTask;
-              $routeEvaluate = $idRoute;
+              $routeEvaluate = $sGateUID;
               if($nextTask != "-1"){
                 $arrayGateways[$countG]['0']   = $sGateUID;
                 $arrayGateways[$countG]['1']   = 'bpmnGatewayExclusiveData';
diff --git a/workflow/engine/templates/bpmn/processmap.js b/workflow/engine/templates/bpmn/processmap.js
index 306c5ed6a..2c75a39b1 100755
--- a/workflow/engine/templates/bpmn/processmap.js
+++ b/workflow/engine/templates/bpmn/processmap.js
@@ -477,6 +477,7 @@ Ext.onReady ( function() {
             {
                 if(typeof this.workflow.figures.data[conn] === 'object')
                 {
+                    //If End Process or Evaluate
                     if(targetid == '-1' || typeof shapes.routes[i][5] != 'undefined' && shapes.routes[i][5] == 'EVALUATE')
                     {
                         targetObj = eval("new bpmnEventEmptyEnd (this.workflow)");