diff --git a/patches/cinder-vitastor.py b/patches/cinder-vitastor.py
index 259fd3a46..968dafbc0 100644
--- a/patches/cinder-vitastor.py
+++ b/patches/cinder-vitastor.py
@@ -455,7 +455,7 @@ class VitastorDriver(driver.CloneableImageVD,
         vol_name = utils.convert_str(volume.name)
         snap_name = utils.convert_str(snapshot.name)
 
-        snap = self._get_image(vol_name+'@'+snap_name)
+        snap = self._get_image("volume-"+snapshot.volume_id+'@'+snap_name)
         if not snap:
             raise exception.SnapshotNotFound(snapshot_id = snap_name)
         snap_inode_id = int(resp['responses'][0]['kvs'][0]['value']['id'])
@@ -584,6 +584,8 @@ class VitastorDriver(driver.CloneableImageVD,
                 { 'request_put': { 'key': 'config/inode/'+pool_s+'/'+str(image_id), 'value': json.dumps({
                     **cfg, 'name': vol_name,
                 }) } },
+            ], 'failure': [
+                { 'request_put': { 'key': 'index/maxid/'+pool_s, 'value': image_id } },
             ] })
             if not resp.get('succeeded'):
                 # repeat