Clearer and more reliable code
Fix an other ConcurrentModificationException