[BUGFIX] Another fix for comment count