Fixed multiple token storage bug