Fix token again