Temporary fix for the wrong token issue