fix channel state handling