Snapshots fix