added proper escaping