diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo
index 4a4dd8a..7eb8821 100644
Binary files a/.vs/Crunchyroll Downloader/v17/.suo and b/.vs/Crunchyroll Downloader/v17/.suo differ
diff --git a/Crunchyroll Downloader/CRD_List_Item.vb b/Crunchyroll Downloader/CRD_List_Item.vb
index 230335a..96cd8b8 100644
--- a/Crunchyroll Downloader/CRD_List_Item.vb	
+++ b/Crunchyroll Downloader/CRD_List_Item.vb	
@@ -985,8 +985,47 @@ Public Class CRD_List_Item
                     'End If
                 End If
                 m3u8FileContent = m3u8FileContent + KeyLine + vbLf
+            ElseIf CBool(InStr(textLenght(i2), "#EXT-X-ENDLIST")) Then 're-adding the CR playlist fix.
+                ' ElseIf textLenght(i) =  Then                'And my.Settings.FixCRStream = True Then
 
+                Try
+                    Dim StringCount As String = Count.ToString
+                    Dim StringCount_1 As String = (Count + 1).ToString
+
+                    Debug.WriteLine("old: " + LastUrl)
+
+                    Dim NewUrl As String = Nothing
+
+                    Me.Invoke(New Action(Function() As Object
+                                             NewUrl = LastUrl.Replace("-" + StringCount + "-", "-" + StringCount_1 + "-")
+                                             Return Nothing
+                                         End Function))
+
+                    Debug.WriteLine("new: " + NewUrl)
+
+                    Dim File As String = Folder + String.Format("{0:00000}", Count) + ".ts"
+                    Dim curi As String = GetFullUri(url, NewUrl)
+
+                    WC_TS = New WebClient
+
+                    WC_TS.DownloadFile(New Uri(curi), File)
+                    HybrideLog = HybrideLog + vbNewLine + Date.Now.ToString + ": " + File + " - " + curi
+                    m3u8FileContent = m3u8FileContent + "#EXTINF:4.048," + vbLf 'dummy line
+                    m3u8FileContent = m3u8FileContent + File + vbLf
+                    Dim FragmentsFinised = Count * 100 / FragmentsInt
+                    'Dim Update = New Thread(Sub() Me.TS_StatusAsync(CInt(FragmentsFinised), di, PauseTime))
+                    'Update.Start()
+                    RaiseEvent UpdateUI(CInt(FragmentsFinised), di, PauseTime)
+                    Count = Count + 1
+
+
+                    m3u8FileContent = m3u8FileContent + textLenght(i) + vbLf
+                Catch ex As Exception
+                    HybrideLog = HybrideLog + vbNewLine + Date.Now.ToString + ": CR fix failed to access unlisted file #882"
+                    m3u8FileContent = m3u8FileContent + textLenght(i) + vbLf
+                End Try
             Else
+
                 m3u8FileContent = m3u8FileContent + textLenght(i) + vbLf
             End If
 
@@ -1675,7 +1714,8 @@ Public Class CRD_List_Item
                     'File.WriteAllText(logfile, HybrideLog)
                     WriteText(logfile, HybrideLog)
                 Catch ex As Exception
-                    MsgBox(ex.ToString)
+                    Error_msg.ShowErrorDia(ex.ToString, "Unable to write Hybrid Mode logfile", False)
+                    'MsgBox(ex.ToString)
                 End Try
             End If
         Catch ex As Exception
@@ -1697,7 +1737,9 @@ Public Class CRD_List_Item
             End Using
 
         Catch ex As Exception
-            MsgBox(ex.ToString)
+            'MsgBox(ex.ToString)
+            Error_msg.ShowErrorDia(ex.ToString, "Unable to write logfile", False)
+
         End Try
 
     End Sub
diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb
index fb9f582..29a9b7e 100644
--- a/Crunchyroll Downloader/Main.vb	
+++ b/Crunchyroll Downloader/Main.vb	
@@ -2906,7 +2906,7 @@ Public Class Main
                 ProcessLoading(Url, Auth2, Loc_CR_Cookies, RT_count)
             Else
                 Dim v1Token As String = CurlPost("https://beta-api.crunchyroll.com/auth/v1/token", Loc_CR_Cookies, Auth, Post, "add_main_4494")
-                MsgBox(v1Token)
+                'MsgBox(v1Token)
                 If CBool(InStr(v1Token, "HTTP Status: 401")) = True Then
                     MsgBox("CR reported :" + vbNewLine + v1Token, MsgBoxStyle.Exclamation, "CR-Error 401")
                     LoginForm.ShowDialog()
diff --git a/Crunchyroll Downloader/My Project/AssemblyInfo.vb b/Crunchyroll Downloader/My Project/AssemblyInfo.vb
index c3022bf..55e3826 100644
--- a/Crunchyroll Downloader/My Project/AssemblyInfo.vb	
+++ b/Crunchyroll Downloader/My Project/AssemblyInfo.vb	
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.23.7")>
-<Assembly: AssemblyFileVersion("3.23.7")>
+<Assembly: AssemblyVersion("3.23.8")>
+<Assembly: AssemblyFileVersion("3.23.8")>
 <Assembly: NeutralResourcesLanguage("en")>