Class N: new feature NaN and try fixing bug