Fixed the issue happen new token generating