Fixed joining channels - finally!