Fixed SCI-675, removed concurrent modification