diff --git a/uc_addresses.ubercart.inc b/uc_addresses.ubercart.inc
index 9a22b9d..4f207c9 100644
--- a/uc_addresses.ubercart.inc
+++ b/uc_addresses.ubercart.inc
@@ -325,8 +325,8 @@ function uc_addresses_order_pane_address($type, $op, $order, $values = array())
 
     case 'edit-process':
       $order_values = $order;
-      $order = uc_order_load($order_values['order_id']);
-      $address = $order->uc_addresses[$type];
+      $saved_order = uc_order_load($order_values['order_id']);
+      $address = $saved_order->uc_addresses[$type];
       $changes = array();
 
       foreach ($order_values[$uc_type] as $key => $value) {