attempt to fix delivery race condition