#14 added support for working around missing field defs