Find and fix big bug in delivery notification