Fix tokens' states being overwritten