diff --git a/lib/ProductOpener/Attributes.pm b/lib/ProductOpener/Attributes.pm
index bd43e2397e455..64a52724cc80d 100644
--- a/lib/ProductOpener/Attributes.pm
+++ b/lib/ProductOpener/Attributes.pm
@@ -36,7 +36,6 @@ See https://wiki.openfoodfacts.org/Product_Attributes
 If new attributes are added, make sure *to update the list of fields* fetched from MongoDB
 in Display.pm (in search_and_display_products subroutine).
 
-
 =cut
 
 package ProductOpener::Attributes;
@@ -98,7 +97,7 @@ $options{attribute_groups} = [
 # Build a hash of attribute groups to make it easier to retrieve all attributes of a specific group
 my %attribute_groups = ();
 
-# Build a hash of attributes to make it easier to retrieve all attributes
+# Build a hash of attributes to make it easier to retrieve all attributes
 my %attributes = ();
 
 if (defined $options{attribute_groups}) {
@@ -472,11 +471,16 @@ sub compute_attribute_nutriscore ($product_ref, $target_lc, $target_cc) {
 
 	my $attribute_ref = initialize_attribute($attribute_id, $target_lc);
 
-	# Nutri-Score A, B, C, D or E
-	if ((defined $product_ref->{nutriscore_grade}) and ($product_ref->{nutriscore_grade} =~ /^[a-e]$/)) {
-		$attribute_ref->{status} = "known";
+	my $nutriscore_ref = deep_get($product_ref, "nutriscore", $version);
+
+	# Check that we have computed a Nutri-Score with the expected version
+	# and that the Nutri-Score is A, B, C, D or E
 
-		my $nutriscore_ref = $product_ref->{nutriscore}{$version};
+	if (    (defined $nutriscore_ref)
+		and (defined $product_ref->{nutriscore_grade})
+		and ($product_ref->{nutriscore_grade} =~ /^[a-e]$/))
+	{
+		$attribute_ref->{status} = "known";
 
 		my $is_beverage = $nutriscore_ref->{data}{is_beverage};
 		my $is_water = $nutriscore_ref->{data}{is_water};
diff --git a/stop_words.txt b/stop_words.txt
index d43e00fdd4d50..c59566ab8f8a5 100644
--- a/stop_words.txt
+++ b/stop_words.txt
@@ -156,6 +156,7 @@ lc
 LCA
 legumes
 Lowercased
+m²
 Malaceous
 maltodextrine
 malus