First fix for broken channel