Do not account for stopwords as much as we did

Do not account for stopwords as much as we did #512