Fixed potential ConcurrentModification