wip: use ChannelFiller when needed