Fix issue where messages were being sent on the wrong channels