Fixed Problem with unescaped single quotes