Fixed NaNsense