Fix Concurrent issue on listeners