fix b2b flow