fixed unicode conflicts