Fixed bug with unicode