First stab at resolving fieldOrder issue