Fixed ConcurrentModification Exception (Bug Id: 47287)