Fix bug in channels controller, close #10