Shipment Monitoring module fix