trying to fix token issues