diff --git a/inxi b/inxi
index 42f3c3e..5d38e8a 100755
--- a/inxi
+++ b/inxi
@@ -1,7 +1,7 @@
 #!/bin/bash
 ########################################################################
 ####  Script Name: inxi
-####  version: 1.5.990
+####  version: 1.5.991
 ####  Date: June 7 2011
 ########################################################################
 ####  SPECIAL THANKS
@@ -5963,10 +5963,13 @@ print_machine_data()
 	
 	if [[ ${#A_MACHINE_DATA[@]} -gt 0 ]];then
 		# note: in some case a mobo/version will match a product name/version, do not print those
-		if [[ -n ${A_MACHINE_DATA[1]} && -n ${A_MACHINE_DATA[6]} && ${A_MACHINE_DATA[1]} == ${A_MACHINE_DATA[6]} ]] || \
+		# some special cases, with: System MSI product MS-7680/Mobo MSI model H61M-P23 (MS-7680)
+		if [[ -n ${A_MACHINE_DATA[1]} && -n ${A_MACHINE_DATA[6]} && ${A_MACHINE_DATA[1]} == *${A_MACHINE_DATA[6]}* ]] || \
+			[[ -n ${A_MACHINE_DATA[1]} && -n ${A_MACHINE_DATA[6]} && *${A_MACHINE_DATA[1]}* == ${A_MACHINE_DATA[6]} ]] || \
 		   [[ -z ${A_MACHINE_DATA[0]} ]];then
 			b_skip_system='true'
 		fi
+		# no point in showing chassis if system isn't there, it's very unlikely that would be correct
 		if [[ $B_EXTRA_EXTRA_DATA == 'true' && $b_skip_system != 'true' ]];then
 			if [[ -n ${A_MACHINE_DATA[6]} && -n ${A_MACHINE_DATA[14]} && ${A_MACHINE_DATA[14]} == ${A_MACHINE_DATA[6]} ]];then
 				b_skip_chassis='true'