Fix compatibility issue with CBS (CBPO)