SPOI-3244 #resolve #comment fix the ConcurrentModificationException