Scanner now catches last token