fix: prevent possible concurrent modification of a collection

fix: prevent possible concurrent modification of a collection #3097