Fixed ConcurrentModification Exception related to iterator removing
object when iterating