Fixing unicode conversion issue