Fix arithmetic computation