shipping-delivery fix