Fixed the channel setup.  This fixes bug #7097.