Fixed problem with unicode