Fix upstream build error: unicode char rejected