New selective deserialization now seems to work