!fixup: BF: don't lose pivot