ChannelDispatcher fix