FIxed the CCA bug