Fix overflow on deliveries