diff --git a/vendor/cmder.sh b/vendor/cmder.sh
index 7ccddcf..4074346 100644
--- a/vendor/cmder.sh
+++ b/vendor/cmder.sh
@@ -42,10 +42,10 @@ elif [ -d "${CMDER_ROOT}/vendor/git-for-windows" ] ; then
 fi
 
 if [[ ! "$PATH" =~ "${GIT_INSTALL_ROOT}/bin:" ]] ; then
-  PATH=${GIT_INSTALL_ROOT}/bin:$PATH
+  PATH="${GIT_INSTALL_ROOT}/bin:$PATH"
 fi
 
-PATH=${CMDER_ROOT}/bin:${CMDER_ROOT}/vendor/bin:$PATH:${CMDER_ROOT}
+PATH="${CMDER_ROOT}/bin:${CMDER_ROOT}/vendor/bin:$PATH:${CMDER_ROOT}"
 
 export PATH
 
@@ -80,7 +80,7 @@ if [ "${CMDER_USER_CONFIG}" != "" ] ; then
     mv "$CMDER_USER_CONFIG/user-profile.sh" "$CMDER_USER_CONFIG/user_profile.sh"
   fi
 
-  export PATH=${CMDER_USER_CONFIG}/bin:$PATH
+  export PATH="${CMDER_USER_CONFIG}/bin:$PATH"
 
   CmderUserProfilePath="${CMDER_USER_CONFIG}/user_profile.sh"
   if [ -f "${CMDER_USER_CONFIG}/user_profile.sh" ] ; then
diff --git a/vendor/lib/lib_path.cmd b/vendor/lib/lib_path.cmd
index 725b549..5788c35 100644
--- a/vendor/lib/lib_path.cmd
+++ b/vendor/lib/lib_path.cmd
@@ -74,7 +74,7 @@ exit /b
     set "find_query=%add_to_path%"
     set "find_query=%find_query:\=\\%"
     set "find_query=%find_query: =\ %"
-    set OLD_PATH=%PATH%
+    set "OLD_PATH=%PATH%"
 
     setlocal enabledelayedexpansion
     if "!found!" == "0" (