diff --git a/CoreHelpers.tl b/CoreHelpers.tl
index 403b8ed..ecea583 100644
--- a/CoreHelpers.tl
+++ b/CoreHelpers.tl
@@ -53,7 +53,7 @@ end
 
 
 function CoreHelpers.parseToken(state: Environment): string
-	local chr = state.activeInputStream:readCurrentCharacter()
+	local chr = ""
 	local token = ""
 	while(not CoreHelpers.isWhitespace(chr)) do
 		token = token..chr
diff --git a/InputStream.tl b/InputStream.tl
index e046123..1a91a07 100644
--- a/InputStream.tl
+++ b/InputStream.tl
@@ -62,9 +62,10 @@ function InputStream:readCurrentCharacter(): string
 end
 
 function InputStream:advanceOffset(): string
+	local current_char = self.str:sub(self.offset, self.offset)
 	self.offset = self.offset + 1
 	self:_manageBuffer()
-	return self.str:sub(self.offset, self.offset)
+	return current_char
 end
 
 return InputStream