Channel close fix