fixed the unicode bugs