Bugfix: a lot of non ASCII issues