Fix escaping for realz this time