Fixed to escape single quotes