fixes bug in channel subscription modification
cleanup