fix deserialization issues