fix unicode issues