token id issue fixed