diff --git a/htdocs/core/lib/asset.lib.php b/htdocs/core/lib/asset.lib.php
index 369c351cbaf..117c564dc95 100644
--- a/htdocs/core/lib/asset.lib.php
+++ b/htdocs/core/lib/asset.lib.php
@@ -57,7 +57,7 @@ function assetAdminPrepareHead()
 
 	$head[$h][0] = DOL_URL_ROOT.'/asset/admin/asset_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
-	$nbExtrafields = $extrafields->attributes['asset']['count']);
+	$nbExtrafields = $extrafields->attributes['asset']['count'];
 	if ($nbExtrafields > 0) {
 		$head[$h][1] .= ' <span class="badge">'.$nbExtrafields.'</span>';
 	}
diff --git a/htdocs/core/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php
index 41f65be3622..9ccffab8b49 100644
--- a/htdocs/core/lib/contract.lib.php
+++ b/htdocs/core/lib/contract.lib.php
@@ -130,7 +130,7 @@ function contract_admin_prepare_head()
 
 	$head[$h][0] = DOL_URL_ROOT.'/contrat/admin/contract_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
-	$nbExtrafields = is_countable($extrafields->attributes['contrat']['label']) ? count($extrafields->attributes['contrat']['label']) : 0;
+	$nbExtrafields = $extrafields->attributes['contrat']['count'];
 	if ($nbExtrafields > 0) {
 		$head[$h][1] .= ' <span class="badge">'.$nbExtrafields.'</span>';
 	}
@@ -139,7 +139,7 @@ function contract_admin_prepare_head()
 
 	$head[$h][0] = DOL_URL_ROOT.'/contrat/admin/contractdet_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsLines");
-	$nbExtrafields = is_countable($extrafields->attributes['contratdet']['label']) ? count($extrafields->attributes['contratdet']['label']) : 0;
+	$nbExtrafields = $extrafields->attributes['contratdet']['count'];
 	if ($nbExtrafields > 0) {
 		$head[$h][1] .= ' <span class="badge">'.$nbExtrafields.'</span>';
 	}
diff --git a/htdocs/core/lib/donation.lib.php b/htdocs/core/lib/donation.lib.php
index 06a8fca02d1..f951d9b522f 100644
--- a/htdocs/core/lib/donation.lib.php
+++ b/htdocs/core/lib/donation.lib.php
@@ -49,7 +49,7 @@ function donation_admin_prepare_head()
 
 	$head[$h][0] = DOL_URL_ROOT.'/don/admin/donation_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
-	$nbExtrafields = is_countable($extrafields->attributes['don']['label']) ? count($extrafields->attributes['don']['label']) : 0;
+	$nbExtrafields = $extrafields->attributes['don']['count'];
 	if ($nbExtrafields > 0) {
 		$head[$h][1] .= ' <span class="badge">'.$nbExtrafields.'</span>';
 	}
diff --git a/htdocs/hrm/lib/hrm.lib.php b/htdocs/hrm/lib/hrm.lib.php
index a571231c143..d821c2f5216 100644
--- a/htdocs/hrm/lib/hrm.lib.php
+++ b/htdocs/hrm/lib/hrm.lib.php
@@ -56,7 +56,7 @@ function hrmAdminPrepareHead()
 
 	$head[$h][0] = DOL_URL_ROOT . '/hrm/admin/evaluation_extrafields.php';
 	$head[$h][1] = $langs->trans("EvaluationsExtraFields");
-	$nbExtrafields = is_countable($extrafields->attributes['hrm_evaluation']['label']) ? count($extrafields->attributes['hrm_evaluation']['label']) : 0;
+	$nbExtrafields = $extrafields->attributes['hrm_evaluation']['count'];
 	if ($nbExtrafields > 0) {
 		$head[$h][1] .= ' <span class="badge">'.$nbExtrafields.'</span>';
 	}
@@ -65,7 +65,7 @@ function hrmAdminPrepareHead()
 
 	$head[$h][0] = DOL_URL_ROOT . '/hrm/admin/job_extrafields.php';
 	$head[$h][1] = $langs->trans("JobsExtraFields");
-	$nbExtrafields = is_countable($extrafields->attributes['hrm_job']['label']) ? count($extrafields->attributes['hrm_job']['label']) : 0;
+	$nbExtrafields = $extrafields->attributes['hrm_job']['count'];
 	if ($nbExtrafields > 0) {
 		$head[$h][1] .= ' <span class="badge">'.$nbExtrafields.'</span>';
 	}
@@ -74,7 +74,7 @@ function hrmAdminPrepareHead()
 
 	$head[$h][0] = DOL_URL_ROOT . '/hrm/admin/skill_extrafields.php';
 	$head[$h][1] = $langs->trans("SkillsExtraFields");
-	$nbExtrafields = is_countable($extrafields->attributes['hrm_skill']['label']) ? count($extrafields->attributes['hrm_skill']['label']) : 0;
+	$nbExtrafields = $extrafields->attributes['hrm_skill']['count'];
 	if ($nbExtrafields > 0) {
 		$head[$h][1] .= ' <span class="badge">'.$nbExtrafields.'</span>';
 	}