Fix escaping issue