Fix tuple creation when there's a discovery token being passed in