Fixed bug with delivery