Fixed Issue where workflow may fail on custom fields