Fixup, in case there aren't additional fields