lingering tokenOnly fix