Try to fix concurrent modification exception