Fix unicode character ambiguity

For #1908. @yebblies will still have to rebase though.

Please wait on the testers, I fixed this using the web interface...