diff --git a/inxi b/inxi
index 417e4fa..c3563fd 100755
--- a/inxi
+++ b/inxi
@@ -2,8 +2,8 @@
 ########################################################################
 ####  Script Name: inxi
 ####  Version: 2.1.8
-####  Date: 2014-04-24
-####  Patch Number: 01-b2
+####  Date: 2014-03-24
+####  Patch Number: 05-b2
 ########################################################################
 ####  SPECIAL THANKS
 ########################################################################
@@ -9629,7 +9629,7 @@ print_graphics_data()
 		part_1_data="${C1}Card$SEP3${C2} Failed to Detect Video Card! "
 	fi
 	# Print cards if not dual card system
-	if [[ -n ${graphics_data% } ]];then 
+	if [[ -n $part_1_data$part_2_data ]];then 
 		if [[ $( calculate_line_length "$part_1_data $part_2_data" ) -gt $COLS_INNER ]];then
 			graphics_data=$( create_print_line "$line_starter" "$part_1_data" )
 			print_screen_output "$graphics_data"
@@ -9637,7 +9637,7 @@ print_graphics_data()
 			line_starter=' '
 			echo 1
 		fi
-		graphics_data=$( create_print_line "$line_starter" "$part_1_data$part_2_data" )
+		graphics_data=$( create_print_line "$line_starter" "$part_1_data $part_2_data" )
 		print_screen_output "$graphics_data"
 		echo 2
 	fi
@@ -9647,16 +9647,16 @@ print_graphics_data()
 	part_1_data="$display_server_string$driver_string"
 	part_2_data="${C1}$res_tty$SEP3${C2} $screen_resolution $root_x_string"
 	
-	graphics_data="$part_1_data$part_2_data"
-	if [[ -n ${graphics_data%% } && $( calculate_line_length "$graphics_data" ) -gt $COLS_INNER ]];then
+	if [[ -n $part_1_data$part_2_data && $( calculate_line_length "$part_1_data $part_2_data" ) -gt $COLS_INNER ]];then
 		graphics_data=$( create_print_line "$line_starter" "$part_1_data" )
 		print_screen_output "$graphics_data"
 		line_starter=' '
+		part_1_data=''
 		graphics_data=$part_2_data
 		echo 3
 	fi
-	if [[ -n ${graphics_data%% } ]];then
-		graphics_data=$( create_print_line "$line_starter" "$graphics_data${CN}" )
+	if [[ -n $part_1_data$part_2_data ]];then
+		graphics_data=$( create_print_line "$line_starter" "$part_1_data$part_2_data" )
 		print_screen_output "$graphics_data"
 		line_starter=' '
 		echo 4