Hotfix to resolve case and in-channel issues