* custom fields fix