Channel disconnect handler fix