concurrent modification bugfix