Change control flow for average/round