Fixup for unicode