fixed unicode issues