diff --git a/Changes b/Changes
index a3e09db..07d41a6 100644
--- a/Changes
+++ b/Changes
@@ -4,6 +4,7 @@
       than 3 characters (margaretha)
     - [bugfix] Making totalResult counter long to prevent overflows (diewald)
     - [bugfix] Do not allow optional Lucene Regex extensions (diewald)
+    - [bugfix] Fix right context in token list retrieval (#141; diewald)
 
 0.64.4 2025-09-17
     - [feature] Added --progress option to Krill-Indexer (kupietz)
@@ -14,8 +15,8 @@
 0.64.3 2025-08-19
     - [feature] Add tar and zip archive input support to Krill-Indexer (kupietz)
     - [security] Update dependencies (kupietz)
-	- [enhancement] Add support for "corpus" in deserialization, "collection" 
-	  is marked as legacy (margaretha). 
+    - [enhancement] Add support for "corpus" in deserialization, "collection" 
+      is marked as legacy (margaretha). 
 
 0.64.2 2025-07-02
     - [bugfix] Restore rewrites in Meta. (diewald)
diff --git a/src/main/java/de/ids_mannheim/korap/response/Match.java b/src/main/java/de/ids_mannheim/korap/response/Match.java
index d1e95f5..2700c16 100644
--- a/src/main/java/de/ids_mannheim/korap/response/Match.java
+++ b/src/main/java/de/ids_mannheim/korap/response/Match.java
@@ -1656,7 +1656,7 @@
             };
         
             if (this.context.right.isToken() && this.context.right.getLength() > 0) {
-                endContext = this.endPos + this.context.right.getLength() - 1;
+                endContext = this.endPos + this.context.right.getLength();
             };
         };
        
diff --git a/src/test/java/de/ids_mannheim/korap/index/TestMatchIdentifier.java b/src/test/java/de/ids_mannheim/korap/index/TestMatchIdentifier.java
index b38647d..abe0aab 100644
--- a/src/test/java/de/ids_mannheim/korap/index/TestMatchIdentifier.java
+++ b/src/test/java/de/ids_mannheim/korap/index/TestMatchIdentifier.java
@@ -572,6 +572,12 @@
 			snippet
 			);
 
+        String snippetTokens = km.getSnippetTokens().toString();
+        assertEquals("{\"left\":[\"angesehen\",\"wurde\"]," +
+                     "\"match\":[\"Der\",\"alte\",\"Baum\"]," +
+                     "\"right\":[\"war\",\"eine\"]}",
+                     snippetTokens);
+
 		// Expansion - no context but inner match
 		km = ki.getMatchInfo("match-WPD17/H81/63495-p88-91", "tokens",
 								   "xyz", "s", true, true, true);