diff --git a/modules/com_vtiger_workflow/tasks/VTCreateEntityTask.inc b/modules/com_vtiger_workflow/tasks/VTCreateEntityTask.inc
index 3226bcff50183850954601d6593b348c8d8839c8..44d33b862a741e66202dc2bfa8507afb0d8c8c60 100644
--- a/modules/com_vtiger_workflow/tasks/VTCreateEntityTask.inc
+++ b/modules/com_vtiger_workflow/tasks/VTCreateEntityTask.inc
@@ -73,11 +73,8 @@ class VTCreateEntityTask extends VTTask {
 				if ($fieldValueType == 'fieldname') {
 					$field = $fieldValue;
 					$module = $referenceModule;
-					if ($referenceModule == $entityType) {
-						$components = vtws_getIdComponents($entity->get($field));
-						$referenceRecordId = $components[1];
-						$fieldValue = $referenceRecordId;
-					} else if (php7_count($matches) > 0) {
+					
+					if (php7_count($matches) > 0) {
 						$referenceField = $matches[1];
 						$referencedModule = $matches[2];
 						$referencedFieldName = $matches[3];
@@ -92,7 +89,7 @@ class VTCreateEntityTask extends VTTask {
 						$referenceFieldFocus = $this->getReferenceFieldFocus($referencedModule, $referenceField, $referenceRecordId);
 						$fieldValue = $referenceFieldFocus->column_fields[$referencedFieldName];
 					} else {
-						$fieldValue = decode_html($focus->column_fields[$fieldValue]);
+						$fieldValue = decode_html($focus->column_fields[$field]);
 					}
 
 					$moduleModel = Vtiger_Module_Model::getInstance($module);