Reborder fixup