Fixed double ship-it issue