Removing mutation while enumerating workaround

@pdsarin - review