Fixed concurrent modification exception