diff --git a/podman_hpc/migrate2scratch.py b/podman_hpc/migrate2scratch.py
index 1347191..552999b 100755
--- a/podman_hpc/migrate2scratch.py
+++ b/podman_hpc/migrate2scratch.py
@@ -422,11 +422,11 @@ def migrate_image(self, image):
             return False
 
         img_id = img_info["id"]
+        top_id = img_info["layer"]
         # Get the layers from the manifest
-        rld = self._get_img_layers(self.src, img_info["layer"])
+        rld = self._get_img_layers(self.src, top_id)
 
         # make sure the src squash file exist
-        top_id = rld[-1]["id"]
         logging.debug(f"Reading link: {top_id}")
 
         if self.dst.chk_image(img_id):
@@ -468,11 +468,11 @@ def remove_image(self, image):
             logging.error(f"Image {image} not found\n")
             return False
         img_id = img_info["id"]
+        top_id = img_info["layer"]
         # Get the layers from the manifest
-        rld = self._get_img_layers(self.dst, img_info["layer"])
+        rld = self._get_img_layers(self.dst, top_id)
 
         # make sure the src squash file exist
-        top_id = rld[-1]["id"]
         ln = self.dst.read_link_file(top_id)
         sqf = self.dst.get_squash_filename(ln)
         if os.path.exists(sqf):
diff --git a/podman_hpc/podman_hpc.py b/podman_hpc/podman_hpc.py
index 38b7ae3..4663a4e 100755
--- a/podman_hpc/podman_hpc.py
+++ b/podman_hpc/podman_hpc.py
@@ -15,7 +15,7 @@
 from subprocess import Popen, PIPE
 
 
-__version__ = "1.1.3"
+__version__ = "1.1.4"
 
 
 def _round_nearest(x, a):