Initial fix for channel race