(try to) fix Atom escaping issues