fixup! cbufp: