Token update issue fixed