Added fix for broken UTF-8 2 byte characters