Issue #13: preventing concurrent modification