ConcurrentModificationException bug fixed