removed underscore dependency from wire + fixed channel check logic