diff --git a/API/DTOs/SeriesMetadataDto.cs b/API/DTOs/SeriesMetadataDto.cs
index 8dd9bf9d9..bc1ff9eaa 100644
--- a/API/DTOs/SeriesMetadataDto.cs
+++ b/API/DTOs/SeriesMetadataDto.cs
@@ -40,7 +40,7 @@ namespace API.DTOs
         /// </summary>
         public int ReleaseYear { get; set; }
         /// <summary>
-        /// Language of the content (ISO 639-1 code)
+        /// Language of the content (BCP-47 code)
         /// </summary>
         public string Language { get; set; } = string.Empty;
         /// <summary>
diff --git a/API/Entities/Metadata/SeriesMetadata.cs b/API/Entities/Metadata/SeriesMetadata.cs
index 4ac5bab13..54ea8ccc0 100644
--- a/API/Entities/Metadata/SeriesMetadata.cs
+++ b/API/Entities/Metadata/SeriesMetadata.cs
@@ -32,7 +32,7 @@ namespace API.Entities.Metadata
         /// </summary>
         public int ReleaseYear { get; set; }
         /// <summary>
-        /// Language of the content (ISO 639-1 code)
+        /// Language of the content (BCP-47 code)
         /// </summary>
         public string Language { get; set; } = string.Empty;
         /// <summary>
diff --git a/UI/Web/src/app/book-reader/book-reader/book-reader.component.ts b/UI/Web/src/app/book-reader/book-reader/book-reader.component.ts
index ff7b04a1a..dbf46c56d 100644
--- a/UI/Web/src/app/book-reader/book-reader/book-reader.component.ts
+++ b/UI/Web/src/app/book-reader/book-reader/book-reader.component.ts
@@ -752,7 +752,7 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
   setPageNum(pageNum: number) {
     if (pageNum < 0) {
       this.pageNum = 0;
-    } else if (pageNum >= this.maxPages - 1) {
+    } else if (pageNum >= this.maxPages) {
       this.pageNum = this.maxPages - 1;
     } else {
       this.pageNum = pageNum;
@@ -812,13 +812,14 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
       this.setPageNum(this.pageNum - 1);
     }
 
-    if (this.pageNum === this.maxPages - 1) {
+    if (oldPageNum + 1 === this.maxPages) {
       // Move to next volume/chapter automatically
       this.loadNextChapter();
     }
 
     if (oldPageNum === this.pageNum) { return; }
 
+
     this.loadPage();
   }