Fix for new wrapped channels