Convert to One time token, Fix bug ImageFetcher