diff --git a/common/utils.go b/common/utils.go
index e9f523dd..557a2c56 100644
--- a/common/utils.go
+++ b/common/utils.go
@@ -371,7 +371,7 @@ func WordCount(input string) (count int) {
 	}
 	var inSpace bool
 	for _, value := range input {
-		if unicode.IsSpace(value) {
+		if unicode.IsSpace(value) || unicode.IsPunct(value) {
 			if !inSpace {
 				inSpace = true
 			}