Fix secondary token handling