Shipping calculation fix