diff --git a/recipe.module b/recipe.module
index dc514a9..b1ef093 100644
--- a/recipe.module
+++ b/recipe.module
@@ -896,19 +896,17 @@ function theme_recipe_ingredients($variables) {
           $title = $ingredient['unit_key'];
         }
         
-        // Print the abbreviation if recipe_unit_display says to or the abbreviation is blank (ie = Unit, which we don't print).
+    
+        // Print the abbreviation if recipe_unit_display says to.
         if (!isset($ingredient['abbreviation']) && isset($unit_list[$ingredient['unit_key']])) {
           $ingredient['abbreviation'] = $unit_list[$ingredient['unit_key']]['abbreviation'];
         }
-        if (empty($ingredient['abbreviation'])) {
-          $ingredient['abbreviation'] = '&nbsp;';
-        }
         
         $units = '';
-        if ( variable_get('recipe_unit_display', 0) == 0 || $ingredient['abbreviation'] == '&nbsp;') {
+        if (variable_get('recipe_unit_display', 0) == 0 && !empty($ingredient['abbreviation'])) {
           $units = '<abbr ' . drupal_attributes(array('title' => $title)) . '>' . $ingredient['abbreviation'] . '</abbr>';
         }
-        else {
+        elseif ($ingredient['unit_key'] != 'unit') {
           $units = $title;
         }
         $fullingredient = strlen($ingredient['note']) > 0 ? $ingredient['name'] . ' (' . $ingredient['note'] . ')' : $ingredient['name'];
