Fixed issues with tokenizing