diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh
index d1a629c..946612f 100755
--- a/modules.d/98usrmount/mount-usr.sh
+++ b/modules.d/98usrmount/mount-usr.sh
@@ -58,11 +58,16 @@ mount_usr()
             case "$_dev" in
                 LABEL=*)
                     _dev="$(echo $_dev | sed 's,/,\\x2f,g')"
-                    _dev="/dev/disk/by-label/${_dev#LABEL=}"
+                    _dev=${_dev#LABEL=}
+                    _dev=${_dev#[\'\"]}
+                    _dev=${_dev%[\'\"]}
+                    _dev="/dev/disk/by-label/${_dev}"
                     ;;
                 UUID=*)
-                    _dev="${_dev#block:}"
-                    _dev="/dev/disk/by-uuid/${_dev#UUID=}"
+                    _dev=${_dev#UUID=}
+                    _dev=${_dev#[\'\"]}
+                    _dev=${_dev%[\'\"]}
+                    _dev="/dev/disk/by-uuid/${_dev}"
                     ;;
             esac
             if strstr "$_opts" "subvol=" && \