Fixes issue #2373

Use field if supplied, otherwise fall back to attribute (fixes issue #2373)
You can just push another commit to this branch and it will automatically be added  - we are not so picky about git history here