Fix for channel sharing