Fixed bug in token extractors