Replace add and subtract deprecated argument order