Fixed the TokenExtractor Bug.