Fix a hidden tax issue when using tax and discount