Fix change of support in mh, buggy nextVal (again)