Correct CP assignment again to make it correct this time
Avoid fuzzing