fixed token-input issue