--- uc_vat_number.module.orig	2009-01-28 13:38:56.000000000 +0100
+++ uc_vat_number.module	2009-01-28 13:39:09.000000000 +0100
@@ -124,10 +124,10 @@ function uc_vat_number_token_values($typ
 			$values['store-vat-number'] = variable_get('uc_store_vat_number', t('Your store VAT number'));
 			break;
 
-    case 'uc_order':
+    case 'order':
 			if (user_access('Have to fill VAT number')) {
       	$order = $object;
-				$values['order-vat-number'] = $order->vat_number['source'];
+				$values['order-vat-number'] = $order->data['vat_number'];
 			}
 		break;