Fix deserialization issue