Fix for default shipping address