diff --git a/workflow/engine/classes/class.reportTables.php b/workflow/engine/classes/class.reportTables.php
index 1827a86e4..392103346 100755
--- a/workflow/engine/classes/class.reportTables.php
+++ b/workflow/engine/classes/class.reportTables.php
@@ -553,6 +553,15 @@ class ReportTables
     public function updateTables ($sProcessUid, $sApplicationUid, $iApplicationNumber, $aFields)
     {
         try {
+            $c = new Criteria('workflow');
+            $c->addSelectColumn(BpmnProjectPeer::PRJ_UID);
+            $c->add(BpmnProjectPeer::PRJ_UID, $sProcessUid, Criteria::EQUAL);
+            $ds = ProcessPeer::doSelectRS($c);
+            $ds->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+            $ds->next();
+            $row = $ds->getRow();
+            $isBpmn = isset($row['PRJ_UID']);
+
             if (!class_exists('ReportTablePeer')) {
 			  require_once 'classes/model/ReportTablePeer.php';
 			}
@@ -583,7 +592,7 @@ class ReportTables
                                 foreach ($aTableFields as $aField) {
                                     $sQuery .= '`' . $aField['sFieldName'] . '` = ';
 
-                                    if(!isset($aFields[$aField['sFieldName']])){
+                                    if(!$isBpmn && !isset($aFields[$aField['sFieldName']])){
                                        foreach($aFields as $row){
                                          if(is_array($row) && isset($row[count($row)])){
                                            $aFields = $row[count($row)];
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php b/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php
index a423d4ca8..63e9b684c 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php
@@ -458,8 +458,8 @@ class Consolidated
         $dataTask = $oDyna->load($dyn_uid);
         if ($dataTask['DYN_VERSION'] > 0) {
             G::LoadClass("pmDynaform");
-            $pmDyna = new \pmDynaform(array('APP_DATA' => array()));
-            $pmDyna->fields["CURRENT_DYNAFORM"] = $dyn_uid;
+            $_SESSION['PROCESS'] = $pro_uid;
+            $pmDyna = new \pmDynaform(array('APP_DATA' => array(), "CURRENT_DYNAFORM" => $dyn_uid));
             $json = G::json_decode($dataTask["DYN_CONTENT"]);
             $pmDyna->jsonr($json);
             $fieldsDyna = $json->items[0]->items;