fix for issue when channel and subscribed channel can be different