diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 5d2897d1e..58b46519c 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -223,12 +223,17 @@ namespace MediaBrowser.Model.Entities
 
                         if (!string.IsNullOrEmpty(Title))
                         {
-                            return attributes.AsEnumerable()
-                                // keep Tags that are not already in Title
-                                .Where(tag => Title.IndexOf(tag, StringComparison.OrdinalIgnoreCase) == -1)
-                                // attributes concatenation, starting with Title
-                                .Aggregate(new StringBuilder(Title), (builder, attr) => builder.Append(" - ").Append(attr))
-                                .ToString();
+                           var result = new StringBuilder(Title);
+                            foreach (var tag in attributes)
+                            {
+                                // Keep Tags that are not already in Title.
+                                if (Title.IndexOf(tag, StringComparison.OrdinalIgnoreCase) == -1)
+                                {
+                                    result.Append(" - ").Append(tag);
+                                }
+                            }
+
+                            return result.ToString();
                         }
 
                         return string.Join(" - ", attributes.ToArray());