Merge pull request #1895 from TheBlueMatt/2022-12-fix-missing-data