Fix arithmetic