Merge pull request #28 from TheBlueMatt/2021-06-fix-nondeterminism