fix chanel close handling