Fixed NaNs again