oops. unit NaN count fixed, really. #35