Fix token parsing issue