Merge pull request #1266 from TheBlueMatt/2022-01-fix-double-fail-panic