Fix ccv issue