Possible fix to concurrent modification exception