Fixed message word count problem