fix for token cursor creation