Fix deserialize

- [ ] @Attamusc