Fix some words count