WIP - delivery report
Bugfix