Possible fix for UTF16 character loss