diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs
index 66fe1cc756..78a974bf76 100644
--- a/MediaBrowser.Controller/Entities/TV/Season.cs
+++ b/MediaBrowser.Controller/Entities/TV/Season.cs
@@ -170,10 +170,13 @@ namespace MediaBrowser.Controller.Entities.TV
 
             Func<BaseItem, bool> filter = i => UserViewBuilder.Filter(i, user, query, UserDataManager, LibraryManager);
 
+            Logger.Debug("Season.GetItemsInternal entering GetEpisodes");
             var items = GetEpisodes(user).Where(filter);
 
+            Logger.Debug("Season.GetItemsInternal entering PostFilterAndSort");
             var result = PostFilterAndSort(items, query);
 
+            Logger.Debug("Season.GetItemsInternal complete");
             return Task.FromResult(result);
         }
 
diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index 02ac42b2af..30c06b2442 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -379,13 +379,19 @@ namespace MediaBrowser.Controller.Entities.TV
 
         private IEnumerable<Episode> GetAllEpisodes(User user)
         {
-            return LibraryManager.GetItemList(new InternalItemsQuery(user)
+            Logger.Debug("Series.GetAllEpisodes entering GetItemList");
+
+            var result =  LibraryManager.GetItemList(new InternalItemsQuery(user)
             {
                 AncestorWithPresentationUniqueKey = GetUniqueSeriesKey(this),
                 IncludeItemTypes = new[] { typeof(Episode).Name },
                 SortBy = new[] { ItemSortBy.SortName }
 
-            }).Cast<Episode>();
+            }).Cast<Episode>().ToList();
+
+            Logger.Debug("Series.GetAllEpisodes returning {0} episodes", result.Count);
+
+            return result;
         }
 
         public IEnumerable<Episode> GetSeasonEpisodes(User user, Season parentSeason, bool includeMissingEpisodes, bool includeVirtualUnairedEpisodes)