VLM: correctly save and restore the geometry