Fix for problem on a server-initiated channel close