diff --git a/platformcode/launcher.py b/platformcode/launcher.py
index b4c70d8d..25839355 100644
--- a/platformcode/launcher.py
+++ b/platformcode/launcher.py
@@ -478,15 +478,22 @@ def play_from_library(item):
         # from core.support import dbg;dbg()
         if len(itemlist) > 0:
             reopen = False
+            # from core.support import dbg;dbg()
             while not xbmc.Monitor().abortRequested():
                 played = True
+                # if config.get_setting('next_ep') == 3 and xbmc.Player().playnext:
+                #     return
                 # The user chooses the mirror
                 if not platformtools.is_playing():
-                    # from core.support import dbg;dbg()
+                    if config.get_setting('next_ep') == 3:
+                        xbmc.sleep(500)
+                        if platformtools.is_playing():
+                            return
                     if config.get_setting('autoplay') or reopen:
                         played_time = get_played_time(item)
                         if not played_time and played:
                             return
+
                     options = []
                     selection_implementation = 0
                     for item in itemlist:
diff --git a/platformcode/xbmc_videolibrary.py b/platformcode/xbmc_videolibrary.py
index 2ad55c24..bbb221f8 100644
--- a/platformcode/xbmc_videolibrary.py
+++ b/platformcode/xbmc_videolibrary.py
@@ -100,7 +100,7 @@ def mark_auto_as_watched(item):
             xbmc.executebuiltin('Action(ParentDir)')
             xbmc.sleep(500)
 
-        if next_episode and next_episode.next_ep and config.get_setting('next_ep') == 1:
+        if next_episode and next_episode.next_ep and config.get_setting('next_ep') < 3:
             from platformcode.launcher import play_from_library
             play_from_library(next_episode)