Fix message being sent to all channels