diff --git a/sdk_lib/enter_chroot.sh b/sdk_lib/enter_chroot.sh
index 5846dc185b..b7f8621a5f 100755
--- a/sdk_lib/enter_chroot.sh
+++ b/sdk_lib/enter_chroot.sh
@@ -109,8 +109,8 @@ queue_mount() {
 
   local mounted_path="${MOUNTED_PATH}$target"
 
-  case ${MOUNT_CACHE} in
-  *" on ${mounted_path} "*)
+  case " ${MOUNT_CACHE} " in
+  *" ${mounted_path} "*)
     # Already mounted!
     ;;
   *)
@@ -251,7 +251,7 @@ setup_env() {
     fi
 
     debug "Mounting chroot environment."
-    MOUNT_CACHE=$(mount)
+    MOUNT_CACHE=$(echo $(awk '{print $2}' /proc/mounts))
     mount_queue_init
     queue_mount none "-t proc" /proc
     queue_mount none "-t sysfs" /sys