Serialization fix