Fixed missing tokens