Fixed shipments becoming corrupt if "separate" is false (does not affect "seperate")