really fix the cp bug