Merge pull request #977 from TheBlueMatt/2021-06-fix-double-claim-close