Fix concurrentmodificationexception