Merge pull request #1335 from TheBlueMatt/2022-02-fix-honggfuzz-regression