Made the change, still see crashes. Will investigate but I see it in _many_ tests, does it need to stop this PR?