diff --git a/workflow/engine/classes/model/AdditionalTables.php b/workflow/engine/classes/model/AdditionalTables.php
index 87574c662..ce5cd41d8 100755
--- a/workflow/engine/classes/model/AdditionalTables.php
+++ b/workflow/engine/classes/model/AdditionalTables.php
@@ -108,15 +108,12 @@ class AdditionalTables extends BaseAdditionalTables
         $oDataset = FieldsPeer::doSelectRS($oCriteria);
         $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 
-        while ($oDataset->next()) {
-            $this->fields[] = $oDataset->getRow();
-        }
-
-        foreach ($this->fields as $field) {
-        	if ($field['FLD_TYPE'] == 'TIMESTAMP') {
-        		$indx = $field['FLD_INDEX'];
-        		$this->fields[$indx]['FLD_TYPE'] = 'DATETIME';
-        	}
+        while ($oDataset->next()) {
+        	$auxField = $oDataset->getRow();
+        	if ($auxField['FLD_TYPE'] == 'TIMESTAMP') {
+        		$auxField['FLD_TYPE'] = 'DATETIME';
+        	}
+        	$this->fields[] = $auxField;
         }
 
         return $this->fields;