fix nz whv checking