Fixed compatibility between B3 and B4