fixed unicode problems