--- uc_vat_number.module	2008-11-18 17:57:18.000000000 +0100
+++ uc_vat_number.module	2009-01-03 15:51:57.000000000 +0100
@@ -127,7 +127,7 @@ function uc_vat_number_token_values($typ
     case 'uc_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;
 
@@ -141,7 +141,7 @@ function uc_vat_number_token_values($typ
 function uc_vat_number_token_list($type = 'all') {
   $tokens['global']['store-vat-number'] = t('Your store VAT number.');
 	if ($type == 'uc_order' || $type == 'ubercart' || $type == 'all') {
-		$tokens['uc_order']['order-vat-number'] = t('The VAT number of the customer.');
+		$tokens['order']['order-vat-number'] = t('The VAT number of the customer.');
 	}
   return $tokens;
 }