diff --git a/storminvoice/storminvoice.module b/storminvoice/storminvoice.module
index 8ef6a27..7c76c78 100644
--- a/storminvoice/storminvoice.module
+++ b/storminvoice/storminvoice.module
@@ -974,10 +974,12 @@ function storminvoice_get_rate($node) {
           if ($parent_item->durationunit == 'hour') {
             $found = TRUE;
             $rate_array['rate_to_use'] = $parent_item->price;
+            $rate_array['durationunit'] = 'hour';
           }
           elseif ($parent_item->durationunit == 'day') {
             $found = TRUE;
             $rate_array['rate_to_use'] = $parent_item->price * $hours_per_day;
+            $rate_array['durationunit'] = 'day';
           }
           break;
 
@@ -985,10 +987,12 @@ function storminvoice_get_rate($node) {
           if ($parent_item->durationunit == 'hour') {
             $found = TRUE;
             $rate_array['rate_to_use'] = $parent_item->price / $hours_per_day;
+            $rate_array['durationunit'] = 'hour';
           }
           elseif ($parent_item->durationunit == 'day') {
             $found = TRUE;
             $rate_array['rate_to_use'] = $parent_item->price;
+            $rate_array['durationunit'] = 'day';
           }
           break;
 
@@ -1022,7 +1026,7 @@ function storminvoice_get_item_desc($rate_array, $node) {
   switch ($rate_array['pricemode_used']) {
     case 'hourly':
       if ($node->type == 'stormtimetracking') {
-        $description = date('d M y', $node->trackingdate) . ': ' . t('@dur @units work at @rate per hour on @desc', array('@dur' => $node->billing_duration, '@unit' => $node->durationunit, '@rate' => $node->price, '@desc' => $node->title));
+        $description = date('d M y', $node->trackingdate) . ': ' . t('@dur @units work at @rate per hour on @desc', array('@dur' => $node->billing_duration, '@unit' => $rate_array['durationunit'], '@rate' => $rate_array['rate_to_use'], '@desc' => $node->title));
       }
       else {
         $description = date('d M y') . ': ' . t('@dur @units work at @rate per hour on @desc', array('@dur' => $node->duration, '@unit' => $node->durationunit, '@rate' => $node->price, '@desc' => $node->title));
@@ -1030,7 +1034,7 @@ function storminvoice_get_item_desc($rate_array, $node) {
       break;
     case 'daily':
       if ($node->type == 'stormtimetracking') {
-        $description = date('d M y', $node->trackingdate) . ': ' . t('@dur @units work at @rate per day on @desc', array('@dur' => $node->billing_duration, '@unit' => $node->durationunit, '@rate' => $node->price, '@desc' => $node->title));
+        $description = date('d M y', $node->trackingdate) . ': ' . t('@dur @units work at @rate per day on @desc', array('@dur' => $node->billing_duration, '@unit' => $rate_array['durationunit'], '@rate' => $rate_array['rate_to_use'], '@desc' => $node->title));
       }
       else {
         $description = date('d M y') . ': ' . t('@dur @units work at @rate per day on @desc', array('@dur' => $node->duration, '@unit' => $node->durationunit, '@rate' => $node->price, '@desc' => $node->title));