fixed missing tokens