fix channel issue