Fixed concurrent modification errors