Fix average by not removing zero values