trying to fix chrome/firefox errors double token 2