Fix quote handling