use new charmap for fixup