bugfix: escaping characters