Bug fix in UTF-8 fixup code