Fix the CBC