Same, shouldn't this go to ShippingBundle?