fixing WatchListeners for ConcurrentModificationException