fix unicode issues, part 2