diff --git a/inxi b/inxi
index 211626d..c915474 100755
--- a/inxi
+++ b/inxi
@@ -3180,7 +3180,7 @@ print_partition_data()
 	local a_partition_working='' partition_used='' swap='' partition_data=''
 	local counter=0 line_max=160  i=0 a_partition_data='' line_starter=''
 	local partitionIdClean='' part_dev='' full_dev='' part_label='' full_label=''
-	local part_uuid='' full_uuid='' dev_remote='' b_is_remote=''
+	local part_uuid='' full_uuid='' dev_remote=''
 
 	# this handles the different, shorter, irc colors strings embedded in variable data
 	if [[ $B_RUNNING_IN_SHELL != 'true' ]];then
@@ -3202,7 +3202,8 @@ print_partition_data()
 		IFS=","
 		a_partition_working=(${A_PARTITION_DATA[i]})
 		IFS="$ORIGINAL_IFS"
-		b_is_remote=''
+		full_label=''
+		full_uuid=''
 		if [[ $B_SHOW_PARTITIONS_FULL == 'true' ]] || [[ ${a_partition_working[4]} == 'swap' || ${a_partition_working[4]} == 'main' ]];then
 			if [[ -n ${a_partition_working[2]} ]];then
 				partition_used=" ${C1}used:${C2} ${a_partition_working[2]} (${a_partition_working[3]})"
@@ -3229,7 +3230,7 @@ print_partition_data()
 					part_dev='N/A'
 				fi
 				full_dev=" ${C1}$dev_remote:${C2} $part_dev"
-				if [[ $B_SHOW_LABELS == 'true' && $b_is_remote != 'true' ]];then
+				if [[ $B_SHOW_LABELS == 'true' && $dev_remote != 'remote' ]];then
 					if [[ -n ${a_partition_working[6]} ]];then
 						part_label="${a_partition_working[6]}"
 					else
@@ -3237,7 +3238,7 @@ print_partition_data()
 					fi
 					full_label=" ${C1}label:${C2} $part_label"
 				fi
-				if [[ $B_SHOW_UUIDS == 'true' && $b_is_remote != 'true' ]];then
+				if [[ $B_SHOW_UUIDS == 'true' && $dev_remote != 'remote' ]];then
 					if [[ -n ${a_partition_working[7]} ]];then
 						part_uuid="${a_partition_working[7]}"
 					else