Fix add/subtract function