Merge pull request #875 from TheBlueMatt/2021-04-fix-bench