Fix bug with delivery