--- payment/uc_paypal/uc_paypal.pages.inc	2009-04-18 09:29:16.000000000 +0200
+++ uc_paypal.pages.inc.zone	2009-07-09 21:48:16.000000000 +0200
@@ -194,8 +194,11 @@ function uc_paypal_ec_review() {
       $order->delivery_last_name = '';
     }
 
-    $zone_id = db_result(db_query("SELECT zone_id FROM {uc_zones} WHERE zone_code = '%s'", check_plain($nvp_response['SHIPTOSTATE'])));
     $country_id = db_result(db_query("SELECT country_id FROM {uc_countries} WHERE country_iso_code_2 = '%s'", check_plain($nvp_response['SHIPTOCOUNTRYCODE'])));
+    $country_state = check_plain($nvp_response['SHIPTOSTATE']);
+    if (!empty($country_id) && !empty($country_state)) {
+      $zone_id = db_result(db_query("SELECT zone_id FROM {uc_zones} WHERE zone_country_id = '%s' AND (zone_code = '%s' OR zone_name = '%s')", $country_id, $country_state, $country_state));
+    }
 
     $order->delivery_street1 = check_plain($nvp_response['SHIPTOSTREET']);
     $order->delivery_city = check_plain($nvp_response['SHIPTOCITY']);