Fixup for 6271