diff --git a/LanguageServer/src/main/java/org/nittalab/dtram/languageserver/model/Token.java b/LanguageServer/src/main/java/org/nittalab/dtram/languageserver/model/Token.java
index 0885491..b48b4dc 100644
--- a/LanguageServer/src/main/java/org/nittalab/dtram/languageserver/model/Token.java
+++ b/LanguageServer/src/main/java/org/nittalab/dtram/languageserver/model/Token.java
@@ -71,7 +71,7 @@
     public Token(final String text, final Position start, final boolean atomic) {
         this.text = text;
         this.start = start;
-        this.end = start.move(0, text.codePointCount(0, text.length()) - 1);
+        this.end = start.move(0, text.length() - 1);
         this.atomic = atomic;
     }