fixed: old-token-bug