fix on delivery order during direct-delivery switch under load
removing a lock - squash me