--- cck_fullname.module~	2008-03-03 17:32:56.000000000 -0600
+++ cck_fullname.module	2008-03-03 17:32:56.000000000 -0600
@@ -738,20 +738,26 @@ function cck_fullname_field_formatter($f
         $output = t('Preferred name: '). theme('cck_fullname', $cck_preferredname, $field);
       }
       return $output;
-    case 'last_name_only'://output legal last name
+
+	case 'last_name_only'://output legal last name
       //check and clean the values for output
-        if (isset($item['last'])) {
+        if (!empty($item['last'])) {
           $cck_fullname['last'] = strip_tags($item['last']);
         }
         $output .= theme('cck_fullname', $cck_fullname, $field);
       return $output;
     case 'first_name_only'://output preferred first name
       //check and clean the values for output
-        if (isset($item['first_preferred'])) {
-          $cck_fullname['first_preferred'] = strip_tags($item['first_preferred']);
+        
+        if(!empty($item['first'])) {
+          $cck_fullname['first'] = strip_tags($item['first']);
+        }
+        if (!empty($item['first_preferred'])) {
+          $cck_fullname['first'] = strip_tags($item['first_preferred']);
         }
         $output .= theme('cck_fullname', $cck_fullname, $field);
       return $output;
+
     case 'last_name_first':
       //check and clean the values for output
       if (!empty($item['prefix'])) {