Really fix the concurrent modification issue.