This solves quoting problem, as told in PR title.