Fixes #3073 Snapshot (or restore snapshot) not working