Fixed parsing of token