(de)serialization fix
Small improvement