Merge pull request #2071 from TheBlueMatt/2023-01-fix-fast-extra-ready-panic