Fixed mistakes with CHV