diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt
index 0bd1c70d4..7bfc0bbb5 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt
@@ -194,7 +194,7 @@ class DownloadCache(
         val chapterDirName = provider.getValidChapterDirNames(chapter)
         chapterDirName.forEach {
             if (it in mangaDir.files) {
-                mangaDir.files -= chapterDirName
+                mangaDir.files -= it
             }
         }
     }
@@ -213,7 +213,7 @@ class DownloadCache(
             val chapterDirName = provider.getValidChapterDirNames(chapter)
             chapterDirName.forEach {
                 if (it in mangaDir.files) {
-                    mangaDir.files -= chapterDirName
+                    mangaDir.files -= it
                 }
             }
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
index 238a4ff48..d00aae95c 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
@@ -255,12 +255,13 @@ class DownloadManager(/* SY private */ val context: Context) {
         val newName = provider.getChapterDirName(newChapter)
         val mangaDir = provider.getMangaDir(manga, source)
 
-        val oldFolder = mangaDir.findFile(oldName.find { mangaDir.findFile(it) != null })
+        val oldFolderName = oldName.find { mangaDir.findFile(it) != null }
+        val oldFolder = mangaDir.findFile(oldFolderName)
         if (oldFolder?.renameTo(newName) == true) {
             cache.removeChapter(oldChapter, manga)
             cache.addChapter(newName, mangaDir, manga)
         } else {
-            Timber.e("Could not rename downloaded chapter: %s.", oldName.last())
+            Timber.e("Could not rename downloaded chapter: %s.", oldFolderName)
         }
     }
 }