Bugfix for previous commit, now subtracting when necessary.