removed 'channel is 1' hack; should work gracefully now