diff --git a/inxi b/inxi
index c77ebe4..92b8396 100755
--- a/inxi
+++ b/inxi
@@ -8510,10 +8510,6 @@ get_raid_data_bsd()
 				if ( $1 ~ /raid|mirror/ ) {
 					raidLevel="zfs " $1
 				}
-				# https://blogs.oracle.com/eschrock/entry/zfs_hot_spares
-				else if ($1 ~ /spares/) {
-					getline
-				}
 				else {
 					raidLevel="zfs-no-raid"
 					components = $1
@@ -8522,6 +8518,10 @@ get_raid_data_bsd()
 			}
 			
 			while ( getline && $1 !~ /^$/ ) {
+				# https://blogs.oracle.com/eschrock/entry/zfs_hot_spares
+				if ($1 ~ /spares/) {
+					getline
+				}
 				# print $1
 				components = components separator $1
 				separator=" "
@@ -8606,15 +8606,15 @@ get_raid_component_data_bsd()
 								raidLevel="zfs " $1
 								getline
 							}
-							# https://blogs.oracle.com/eschrock/entry/zfs_hot_spares
-							else if ($1 ~ /spares/) {
-								getline
-							}
 							else {
 								raidLevel="zfs-no-raid"
 							}
 						}
 					}
+					# https://blogs.oracle.com/eschrock/entry/zfs_hot_spares
+					if ($1 ~ /spares/) {
+						getline
+					}
 					sub( /ONLINE/, "", $2 )
 					components=components separator $1 separator $2
 					separator=" "