fix serialization order