AI-406 : avoid ConcurrentModificationException