fixing unicode bugs