Channels are now correctly closed