diff --git a/app/build.gradle b/app/build.gradle
index b5fe3fc7c2..f335825e78 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -76,8 +76,8 @@ android {
         standard {
             buildConfigField "boolean", "INCLUDE_UPDATER", "true"
             dimension "default"
-            versionCode 43
-            versionName "1.6.2"
+            versionCode 44
+            versionName "1.6.2.1"
         }
         dev {
             resConfigs "en"
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
index fb370bde65..6e1e7a90cc 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
@@ -491,24 +491,28 @@ class ReaderPresenter(
     private fun parseChapterName(chapterName: String, pageNumber: String, scanlator: String?): String {
         val builder = StringBuilder()
         var title = ""
+        var vol = ""
         val list = chapterName.split(Regex(" "), 3)
 
         list.forEach {
             if (it.startsWith("vol.", true)) {
-                builder.append("Vol.")
-                builder.append(it.substringAfter(".").padStart(4, '0'))
+                vol = " Vol." + it.substringAfter(".").padStart(4, '0')
+
             } else if (it.startsWith("ch.", true)) {
                 builder.append(" Ch.")
                 builder.append(it.substringAfter(".").padStart(4, '0'))
             } else {
-                title = it
+                title = " $it"
             }
         }
 
+        if (vol.isNotBlank()) {
+            builder.append(vol)
+        }
         builder.append(" Pg.")
         builder.append(pageNumber.padStart(4, '0'))
+
         if (title.isNotEmpty()) {
-            builder.append(" ")
             builder.append(title.take(200))
         }
 
diff --git a/app/src/main/res/raw/changelog_release.xml b/app/src/main/res/raw/changelog_release.xml
index 1c840084fc..9c750b57ea 100644
--- a/app/src/main/res/raw/changelog_release.xml
+++ b/app/src/main/res/raw/changelog_release.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog bulletedList="true">
+    <changelogversion
+        changeDate=""
+        versionName="v1.6.2.1">
+        <changelogtext>Fix saved file name swapping chapter and volume so saved files are always in correct chapter order</changelogtext>
+    </changelogversion>
     <changelogversion
         changeDate=""
         versionName="v1.6.2">