Quote fix
More quote fixes
Merge pull request #1180 from psav/quote_fix

Quote fix