Resolves #1844: fix for adding shipments