  * Fix critical issue causing non-deterministic roster saving
