Fix the race condition when adding and removing new evaluators

That fixes issue #828 (exposed by unit test in PR #827)