Fix: Shipping Discount overlapping