Readded word boundaries