Hotfix: Move channel count to right position