A little more NaNing