Fix addition and multiplication