Fixed initial token bug