Merge pull request #1679 from TheBlueMatt/2022-08-no-double-access