Merge pull request #750 from TheBlueMatt/2020-11-dup-chan-id-crash