fix channel handling