diff --git a/admin/writepanels/writepanel-order_notes.php b/admin/writepanels/writepanel-order_notes.php
index ef4929c079d..98bd8cfda88 100644
--- a/admin/writepanels/writepanel-order_notes.php
+++ b/admin/writepanels/writepanel-order_notes.php
@@ -34,7 +34,7 @@ function woocommerce_order_notes_meta_box() {
 			if ($customer_note) echo 'customer-note';
 			echo '"><div class="note_content">';
 			echo wpautop(wptexturize($note->comment_content));
-			echo '</div><p class="meta">'. sprintf(__('added %s ago', 'woothemes'), human_time_diff(strtotime($note->comment_date))) .' - <a href="#" class="delete_note">'.__('Delete note', 'woothemes').'</a></p>';
+			echo '</div><p class="meta">'. sprintf(__('added %s ago', 'woothemes'), human_time_diff(strtotime($note->comment_date), current_time('timestamp'))) .' - <a href="#" class="delete_note">'.__('Delete note', 'woothemes').'</a></p>';
 			echo '</li>';
 		endforeach;
 	else :
diff --git a/shortcodes/shortcode-order_tracking.php b/shortcodes/shortcode-order_tracking.php
index 972a4a14d99..7ee37d44c99 100644
--- a/shortcodes/shortcode-order_tracking.php
+++ b/shortcodes/shortcode-order_tracking.php
@@ -40,7 +40,7 @@ function woocommerce_order_tracking( $atts ) {
 		
 				$order_status_text = sprintf( __('Order #%s which was made %s has the status &ldquo;%s&rdquo;', 'woothemes'), $order->id, human_time_diff(strtotime($order->order_date), current_time('timestamp')).__(' ago', 'woothemes'), $status->name );
 				
-				if ($order->status == 'completed') $order_status_text .= ' ' . __('and was completed', 'woothemes') . ' ' . human_time_diff(strtotime($order->completed_date)).__(' ago', 'woothemes');
+				if ($order->status == 'completed') $order_status_text .= ' ' . __('and was completed', 'woothemes') . ' ' . human_time_diff(strtotime($order->completed_date), current_time('timestamp')).__(' ago', 'woothemes');
 				
 				$order_status_text .= '.';
 				
diff --git a/woocommerce_actions.php b/woocommerce_actions.php
index f6bf49896a9..52408df62c0 100644
--- a/woocommerce_actions.php
+++ b/woocommerce_actions.php
@@ -253,7 +253,7 @@ function woocommerce_add_order_note() {
 		if ($is_customer_note) echo 'customer-note';
 		echo '"><div class="note_content">';
 		echo wpautop(wptexturize($note));
-		echo '</div><p class="meta">'. sprintf(__('added %s ago', 'woothemes'), human_time_diff(strtotime('NOW'))) .' - <a href="#" class="delete_note">'.__('Delete note', 'woothemes').'</a></p>';
+		echo '</div><p class="meta">'. sprintf(__('added %s ago', 'woothemes'), human_time_diff(current_time('timestamp'))) .' - <a href="#" class="delete_note">'.__('Delete note', 'woothemes').'</a></p>';
 		echo '</li>';
 		
 	endif;