Fixing deserialization