a bit more unicode fixing