diff --git a/META-INF/com/google/android/update-binary b/META-INF/com/google/android/update-binary
index fa8bd92..f511d5f 100755
--- a/META-INF/com/google/android/update-binary
+++ b/META-INF/com/google/android/update-binary
@@ -131,7 +131,7 @@ mount_all() {
   fi;
   byname=bootdevice/by-name;
   [ -d /dev/block/$byname ] || byname=$($BB find /dev/block/platform -type d -name by-name 2>/dev/null | $BB head -n1 | $BB cut -d/ -f4-);
-  [ -d /dev/block/mapper ] && byname=mapper;
+  [ -e /dev/block/$byname/super ] && [ -d /dev/block/mapper ] && byname=mapper;
   [ -e /dev/block/$byname/system ] || slot=$(find_slot);
   case $ANDROID_ROOT in
     /system_root) setup_mountpoint /system;;
diff --git a/META-INF/com/google/android/updater-script b/META-INF/com/google/android/updater-script
index b17d76c..32eed36 100644
--- a/META-INF/com/google/android/updater-script
+++ b/META-INF/com/google/android/updater-script
@@ -3,4 +3,4 @@
 # Dummy file; update-binary is a shell script (DO NOT CHANGE)
 #
 #
-# AK_BASE_VERSION=20230323
+# AK_BASE_VERSION=20230405