Add word boundaries to the regexp