Ticket #1870: Fixing bug with double quotes