Fix concurrent modification exception