revert Listeners threadsafety