Fix for snapshot restore