BUG: Fix for incorrect channel settings