Fixed null values for averages