fixed figure token invalidation