fixed some ConcurrentModificationException's