Actually prevent NaNs