Fixed bugs in B2B