Fixing CARBON-14764 - concurrent modification Exception