Fixing a bug in Unicode support