fixing concurrent modification