diff --git a/Deltarune.asl b/Deltarune.asl
index 4b43506..00df8c7 100644
--- a/Deltarune.asl
+++ b/Deltarune.asl
@@ -79,10 +79,10 @@ state("DELTARUNE", "Demo v1.16/v1.17")
 
     float kingPos : 0x69FA98, 0x0, 0x530, 0x50, 0x158, 0x10, 0xE8;
 
-    string32  sound     : 0x6A3818, 0x60,  0xD0, 0x58, 0x0;
-    string128 text_ch1  : 0x8C2008, 0x1A0, 0x48, 0x10, 0x7B0, 0x0, 0x0, 0x0;
-    string128 text_ch2  : 0x8C2008, 0x1A0, 0x48, 0x10, 0x5F0, 0x0, 0x0, 0x0;
-    string256 song      : 0x6A2F90, 0x0,   0x0,  0x0;
+    string32  sound     : 0x6A3818, 0x60, 0xD0,  0x58, 0x0;
+    string128 text_ch1  : 0x8C2008, 0x10, 0x1A0, 0x48, 0x10, 0x7B0, 0x0, 0x0, 0x0;
+    string128 text_ch2  : 0x8C2008, 0x10, 0x1A0, 0x48, 0x10, 0x5F0, 0x0, 0x0, 0x0;
+    string256 song      : 0x6A2F90, 0x0,  0x0,   0x0;
     string256 directory : 0x8D06E0, 0x0; // Full path to the current game's directory
 }
 
@@ -410,7 +410,12 @@ update
             current.fight   = current.fight_ch2;
             current.text    = current.text_ch2;
         }
-        else current.chapter = 0;
+        else
+        {
+            current.chapter = 0;
+            current.fight   = 0;
+            current.text    = null;
+        }
     }
 
     if(current.chapter > 0)
diff --git a/README.md b/README.md
index 10b4145..e7f3c03 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ This is a LiveSplit Autosplitter for DELTARUNE speedruns.
 ## Supported versions
 
 - SURVEY_PROGRAM
-- Chapter 1&2 v1.08-v1.15
+- Chapter 1&2 v1.08-v1.17
 
 ## How to install