fixed the unicode issues