fix channel walking problems from recent changes (bug #4494)