Shipment Monitoring Fix for Kevin's issue