fix of ConcurrentModificationException