FIX: average bug