Bugfix: escaping single quotes