fixed bug with changing tokens