Patch v7 (Escaping quotation marks)