Hotfix for channel refactor mistake