diff --git a/LanguageServer/src/main/java/org/nittalab/dtram/languageserver/utils/Tokenizer.java b/LanguageServer/src/main/java/org/nittalab/dtram/languageserver/utils/Tokenizer.java
index 9ba0dae..2a241d2 100644
--- a/LanguageServer/src/main/java/org/nittalab/dtram/languageserver/utils/Tokenizer.java
+++ b/LanguageServer/src/main/java/org/nittalab/dtram/languageserver/utils/Tokenizer.java
@@ -141,15 +141,15 @@
                 /* Count the space between tokens */
                 if (prevToken != null && !prevToken.isBlank() && !token.isBlank()) {
                     tokenLength = 1;
-                    newTokens.add(new Token(Tokens.SPACE, new Position(line, column), new Position(line, column + tokenLength - 1), true));
+                    newTokens.add(new Token(Tokens.SPACE, new Position(line, column), true));
                     column += tokenLength;
                 }
                 if (token.isBlank()) {
                     tokenLength = 1;
-                    newTokens.add(new Token(Tokens.SPACE, new Position(line, column), new Position(line, column + tokenLength - 1), true));
+                    newTokens.add(new Token(Tokens.SPACE, new Position(line, column), true));
                 } else {
                     tokenLength = token.codePointCount(0, token.length());
-                    newTokens.add(new Token(token, new Position(line, column), new Position(line, column + tokenLength - 1), false));
+                    newTokens.add(new Token(token, new Position(line, column), false));
                 }
                 column += tokenLength;
             }