diff --git a/libwvdrmengine/move_widevine_data.sh b/libwvdrmengine/move_widevine_data.sh
index 56c1e704..dfdd852a 100755
--- a/libwvdrmengine/move_widevine_data.sh
+++ b/libwvdrmengine/move_widevine_data.sh
@@ -9,8 +9,8 @@ if [ ! -f "$FILES_MOVED" ]; then
   for i in "$SRC_PATH/IDM"*; do
     dest_path=$DEST_PATH/"${i#$SRC_PATH/}"
     if [ -d "$i" ]; then
-      mkdir -p $dest_path -m 700
-      mv $i "$DEST_PATH"
+      mkdir -p "$dest_path" -m 700
+      mv "$i" "$DEST_PATH"
       for file in ${dest_path}/${L3_FILE_PATTERN}; do
         [ -e "${file}" ] || continue
         # We need to move any L3 files in the IDM folder to the L3 subfolder.
@@ -18,7 +18,7 @@ if [ ! -f "$FILES_MOVED" ]; then
         mkdir -p "${l3_dir}" -m 700
         mv "${file}" "${l3_dir}"
       done
-      find $dest_path -print0 | while IFS= read -r -d '' file
+      find "$dest_path" -print0 | while IFS= read -r -d '' file
         do
           chgrp media "$file"
         done