Added delivery indicator checking