Merge pull request #787 from TheBlueMatt/2021-02-check-close-source