Fix issue with in-memory retry queue implementation
Fix issue with in-memory retry queue implementation #2