Fix bug, use token after creation