Fix to compute delivery