Fixed support for the new B::BP