Fixing the channel matching