Fixes issue #2373

Use field if supplied, otherwise fall back to attribute (fixes issue #2373)