Fixed SCI-1025, a concurrent modification error broke all!