Fix parameters to currentToken pointer