Second Shipping Address fix