Added correct quote handling