Merge pull request #1162 from TheBlueMatt/2021-11-fix-accept-chan-checks