BUG: Fixed use of simple averaging