Fixup for worst-case scenario final pair