Fix issue with negative signs and avoid additional cancelling