Token Join bug fix