Fix bug with passing CCV