Fixed CV code.