[BUGFIX] Again another fix for comment count