2 files changed, 11 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
index 737fa9fd6..9a2acc108 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -22,6 +22,15 @@ namespace MediaBrowser.Controller.Entities.TV
             }
         }
 
+        [IgnoreDataMember]
+        protected override bool UseParentPathToCreateResolveArgs
+        {
+            get
+            {
+                return true;
+            }
+        }
+
         /// <summary>
         /// We want to group into series not show individually in an index
         /// </summary>
diff --git a/MediaBrowser.Controller/Resolvers/BaseVideoResolver.cs b/MediaBrowser.Controller/Resolvers/BaseVideoResolver.cs
index 0ed02c10f..aadaf5423 100644
--- a/MediaBrowser.Controller/Resolvers/BaseVideoResolver.cs
+++ b/MediaBrowser.Controller/Resolvers/BaseVideoResolver.cs
@@ -45,7 +45,8 @@ namespace MediaBrowser.Controller.Resolvers
                     return new TVideoType
                     {
                         VideoType = type,
-                        Path = args.Path
+                        Path = args.Path,
+                        IsInMixedFolder = true
                     };
                 }
             }