Fixed deserialization