Actually escape correctly all the time