Finally, fixed multiple token storage bug for real