fix concurrentmodificationexception
Use correct id