Merge pull request #1033 from TheBlueMatt/2021-07-fix-beta