fixed concurrent modification shit