Fixed duplicate CP and CP_CHIEF