diff --git a/game/utility.rpy b/game/utility.rpy
index 4c76e2f..06a7ece 100644
--- a/game/utility.rpy
+++ b/game/utility.rpy
@@ -44,11 +44,16 @@ init python:
         var_list = [
             "anonscore",
             "fangscore",
-            "current_general_chapter" if not use_ending_chapter else "current_ending_chapter",
             "chapter_index",
             "ending_route_number",
             "ending_chapter_index"
         ]
+        
+        if use_ending_chapter:
+            var_list.remove("chapter_index")
+            var_list.append("current_ending_chapter")
+        else:
+            var_list.append("current_general_chapter")
 
         for item in var_list:
             if toggle:
@@ -56,3 +61,4 @@ init python:
             else:
                 renpy.unwatch(item)
 
+