Complete fix for bug with multi-word tokens in preditor