Fix bugs for sums and substractions