Fix bug for last token