# fixed token checking issue