Added fix for word counts