ES-108 : fix for inaccurate delivery status using API