Fixed issue fieldOrder not handling keys correctly.