Switched to using :next-token.