fix active_token class variables