Make channels manager not break