Whitespace tokenizer errors have been fixed