Fixed issue with unicode