Fixing delivery estimate bug. TRAD-20