Fix for empty channels