fixed to use channel_id