Fixed concurrent modification exception.

Spoke to Ted offline.