fixed token issue