Fix for channel part