fix ConcurrentModification Error