Fix for averages