Fixed possible concurrent modification exception