Fixed bug in delivery method