Merge pull request #3543 from weiznich/fix/quote_breaking_change

Fix #3541