diff --git a/workflow/engine/classes/class.xpdl.php b/workflow/engine/classes/class.xpdl.php
index e8d7633e6..5bda7632f 100644
--- a/workflow/engine/classes/class.xpdl.php
+++ b/workflow/engine/classes/class.xpdl.php
@@ -3745,6 +3745,7 @@ class Xpdl extends processes
           $arrayRoutes[$countRoutes]['2']= $idRoute;
           $arrayRoutes[$countRoutes]['3']= $toPort;
           $arrayRoutes[$countRoutes]['4']= $fromPort;
+          $arrayRoutes[$countRoutes]['5']= $typeRoute;
           $countRoutes                   = $countRoutes + 1;
         }
         $events[$countEvents]['0'] = $idRoute;
diff --git a/workflow/engine/templates/bpmn/processmap.js b/workflow/engine/templates/bpmn/processmap.js
index ebb852d6f..71485e203 100755
--- a/workflow/engine/templates/bpmn/processmap.js
+++ b/workflow/engine/templates/bpmn/processmap.js
@@ -436,7 +436,7 @@ Ext.onReady ( function() {
             {
                 if(typeof this.workflow.figures.data[conn] === 'object')
                 {
-                    if(targetid == '-1')
+                    if(targetid == '-1' || typeof shapes.routes[i][5] != 'undefined' && shapes.routes[i][5] == 'EVALUATE')
                     {
                         targetObj = eval("new bpmnEventEmptyEnd (this.workflow)");
                         this.workflow.addFigure(targetObj,sourceObj.x+67,sourceObj.y+60);