fixed uninitialized tokens