fixed unicode bugs