Fix non-#channels and single-symbol channels (#)

Fixes #506