diff --git a/lib/pangea/models/igc_text_data_model.dart b/lib/pangea/models/igc_text_data_model.dart
index fe052a5ec..5f32f92d1 100644
--- a/lib/pangea/models/igc_text_data_model.dart
+++ b/lib/pangea/models/igc_text_data_model.dart
@@ -140,8 +140,6 @@ class IGCTextData {
     matches.removeAt(matchIndex);
 
     for (final match in matches) {
-      final matchOffset = match.match.offset;
-      final matchLength = match.match.length;
       match.match.fullText = originalInput;
       if (match.match.offset > pangeaMatch.match.offset) {
         match.match.offset += replacement.length - pangeaMatch.match.length;
@@ -305,7 +303,7 @@ class IGCTextData {
     // create a pointer to the current index in the original input
     // and iterate until the pointer has reached the end of the input
     int currentIndex = 0;
-    while (currentIndex < originalInput.characters.length - 1) {
+    while (currentIndex < originalInput.characters.length) {
       // check if the pointer is at a match, and if so, get the index of the match
       final int matchIndex = matchRanges.indexWhere(
         (range) => currentIndex >= range[0] && currentIndex < range[1],