Update comment + bug fix channel