Fix average variables