Fix multiple snapshots