Correct to allow for delivery_count being zero-based