fix escaping problems