Fix for new cb version