Fix deserialization problem