fixed issue with custom fields
changed mode