more fix for sdtokens