Attempt to fix ConcurrentModificationException again.