SPEED-6 Fix shipping cost