[hotfix/fix-quoting-bug] Fix quoting bug
Merge branch 'hotfix/fix-quoting-bug'