diff --git a/inxi b/inxi
index b719d30..f790faa 100755
--- a/inxi
+++ b/inxi
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 ########################################################################
 ####  Script Name: inxi
-####  Version: 2.3.20
-####  Date: 2017-06-12
+####  Version: 2.3.21
+####  Date: 2017-06-13
 ####  Patch Number: 00
 ########################################################################
 ####  SPECIAL THANKS
@@ -15103,7 +15103,7 @@ print_system_data()
 	local system_data='' bits='' desktop_environment='' dm_data='' de_extra_data=''
 	local de_string='' distro_string='' line_starter='System:'
 	local host_kernel_string='' host_string='' desktop_type='Desktop'
-	local host_name=$HOSTNAME
+	local host_name=$HOSTNAME 
 	local current_kernel=$( get_kernel_version ) 
 	local distro="$( get_distro_data )"
 	local tty_session='' compiler_string='' distro_os='Distro'
@@ -15125,8 +15125,13 @@ print_system_data()
 				de_extra_data=" ${C1}info$SEP3${C2} $de_extra_data"
 			fi
 		fi
-	else
+	fi
+	# handle separately since some systems will have no root desktop data
+	if [[ $B_RUNNING_IN_DISPLAY == 'false' ]] || [[ $desktop_environment == 'N/A' && $B_ROOT == 'true' ]];then
 		tty_session=$( get_tty_number )
+		if [[ $desktop_environment == 'N/A' ]];then
+			de_extra_data=''
+		fi
 		if [[ -z $tty_session && $B_CONSOLE_IRC == 'true' ]];then
 			tty_session=$( get_tty_console_irc )
 		fi
diff --git a/inxi.changelog b/inxi.changelog
index e79f9e3..1a3f813 100644
--- a/inxi.changelog
+++ b/inxi.changelog
@@ -1,3 +1,18 @@
+=====================================================================================
+Version: 2.3.21
+Patch Version: 00
+Script Date:  2017-06-13
+-----------------------------------
+Changes:
+-----------------------------------
+New version, tarball. Fix for root graphics/desktop data when not available as root.
+
+Was showing in -S line N/A instead of the fallback Console: tty 1 that would match the 
+-G no data for root when unavailable for root.
+
+-----------------------------------
+-- Harald Hope - Tue, 13 Jun 2017 10:59:41 -0700
+
 =====================================================================================
 Version: 2.3.20
 Patch Version: 00