fix MessageSet serialization/deserialization