Fix for new CB