diff --git a/inxi b/inxi
index ce9374d..5028209 100755
--- a/inxi
+++ b/inxi
@@ -5974,19 +5974,15 @@ print_machine_data()
 			if [[ -n ${A_MACHINE_DATA[12]} && $b_skip_chassis != 'true' ]];then
 				chassis_vendor="${C1}Chassis${C2} ${A_MACHINE_DATA[12]}"
 				if [[ -n ${A_MACHINE_DATA[13]} ]];then
-					chassis_type=${A_MACHINE_DATA[13]}
-				else
-					chassis_type='N/A'
+					chassis_type=" ${C1}type${C2} ${A_MACHINE_DATA[13]}"
 				fi
 				if [[ -n ${A_MACHINE_DATA[14]} ]];then
-					chassis_version=${A_MACHINE_DATA[14]}
-				else
-					chassis_version='N/A'
+					chassis_version=" ${C1}version${C2} ${A_MACHINE_DATA[14]}"
 				fi
 				if [[ -n ${A_MACHINE_DATA[15]} && $B_OUTPUT_FILTER != 'true' ]];then
 					chassis_serial=" ${C1}serial${C2} ${A_MACHINE_DATA[15]}"
 				fi
-				chassis_line="$chassis_vendor ${C1}type${C2} $chassis_type ${C1}version${C2} $chassis_version$chassis_serial"
+				chassis_line="$chassis_vendor$chassis_type$chassis_version$chassis_serial"
 			fi
 		fi
 		if [[ -n ${A_MACHINE_DATA[5]} ]];then
@@ -6022,7 +6018,7 @@ print_machine_data()
 		fi
 		mobo_line="${C1}Mobo${C2} $mobo_vendor ${C1}model${C2} $mobo_model$mobo_version$mobo_serial"
 		bios_line="${C1}Bios${C2} $bios_vendor ${C1}version${C2} $bios_version ${C1}date${C2} $bios_date"
-		if [[ $( wc -c <<< "$mobo_line $bios_line" ) -lt $line_max ]];then
+		if [[ $( wc -c <<< "$mobo_line$bios_line" ) -lt $line_max ]];then
 			mobo_line="$mobo_line $bios_line"
 			bios_line=''
 		fi
@@ -6041,14 +6037,12 @@ print_machine_data()
 				product_name='N/A'
 			fi
 			if [[ -n ${A_MACHINE_DATA[2]} ]];then
-				product_version=${A_MACHINE_DATA[2]}
-			else
-				product_version='N/A'
+				product_version=" ${C1}version${C2}${A_MACHINE_DATA[2]}"
 			fi
 			if [[ -n ${A_MACHINE_DATA[3]} && $B_OUTPUT_FILTER != 'true' ]];then
 				product_serial=" ${C1}serial${C2} ${A_MACHINE_DATA[3]} "
 			fi
-			system_line="${C1}System${C2} $system_vendor ${C1}product${C2} $product_name ${C1}version${C2} $product_version$product_serial"
+			system_line="${C1}System${C2} $system_vendor ${C1}product${C2} $product_name$product_version$product_serial"
 			if [[ $( wc -c <<< "$system_line$chassis_line" ) -lt $line_max ]];then
 				system_line="$system_line $chassis_line"
 				chassis_line=''