diff --git a/inxi b/inxi
index 6857e2c..3247e8c 100755
--- a/inxi
+++ b/inxi
@@ -3784,7 +3784,8 @@ get_machine_data()
 				}
 				{
 					gsub(/'"$BAN_LIST_NORMAL"'/, "", $0)
-					gsub(/,|To Be Filled By O.E.M.|Not Available|System manufacturer|System Product Name|System Version|N\/A/, " ", $0)
+					gsub(/,/, " ", $0)
+					sub(/To Be Filled By O.E.M.|Not Available|System manufacturer|System Product Name|System Version|N\/A/, "", $0)
 					gsub(/^ +| +$/, "", $0)
 					gsub(/ [ \t]+/, " ", $0)
 					print $0