fix field serialization ordering