Fix CC handling