fix changes for b2