Fixed shipments being corrupt if "separate" was set to false (does not affect "seperate")