Correct travering through word boundaries