Fix the serialization/deserialization problem