Fixed: Word Boundaries