Fixed bug where wrong Listener was being created on retry for Reversing case