Jamie H - Fixed a race condition that could cause a concurrent modification exception.