Fix: [ bug #1498, #1499 ] Shipment/Delivery triggers problem