Merge pull request #902 from TheBlueMatt/2021-04-fix-fuzz-test