really, truly fix limiting by channel