Fixed subtraction issue