Fix edge cases of word duplication

See merge request !172468



Merged-by: Amy Qualls <aqualls@gitlab.com>
Approved-by: Amy Qualls <aqualls@gitlab.com>
Co-authored-by: Marcel Amirault <mamirault@gitlab.com>