Fixed ConcurrentModificationException