diff --git a/ya.sh b/ya.sh
index ccfd6c2..ddf58ce 100644
--- a/ya.sh
+++ b/ya.sh
@@ -327,8 +327,8 @@ __INTERNAL_yash_sanitize_value() {
 
 __INTERNAL_yash_unquote() {
   local var_name="$1"
-  if [[ "${!var_name}" =~ ^[[:space:]]*\".*\"[[:space:]]*$ ]] || [[ "${!var_name}" =~ ^[[:space:]]*\'.*\'[[:space:]]*$ ]]; then #"
-    eval "$var_name=${!var_name}" || {
+  if [[ "${!var_name}" =~ ^[[:space:]]*\"(.*)\"[[:space:]]*$ ]] || [[ "${!var_name}" =~ ^[[:space:]]*\'(.*)\'[[:space:]]*$ ]]; then #"
+    eval "$var_name=\${BASH_REMATCH[1]}" || {
       yashLogError "could not unquote ${!var_name}"
       return 1
     }