issue #395, item 2
Merge pull request #397 from sasiflo/master

Try to repair of channel administration