Actually fixing the concurrent modification exception (I think)