bug fix, "ConcurrentModificationException" fixed