fix redelivre issue 9