Fixed shipments being corrupt if "separate" was set to false

This does not affect "seperate".