Fix in default delivery mode
Merge pull request #11 from prakashpp/develop

Fix in default delivery mode