Changed a potential ConcurrentModificationException