Fixing the delivery number bug