Fixed Token properly