Fix delivery bug