fixed an issue related to not seen tokens in calculations