Resolved concurrent modification issue