Fix the CBP