bug fix / channel enhancement