tokenEnding fix