--- ../../all/modules/token/token.module	2011-01-11 21:06:43.000000000 -0700
+++ token/token.module	2011-10-08 20:51:33.000000000 -0600
@@ -443,7 +443,7 @@
   }
   switch ($type) {
     case 'node':
-      return isset($object->nid) ? $object->nid : 0;
+      return isset($object->vid) ? $object->vid : (isset($object->nid) ? $object->nid : 0);
     case 'comment':
       return isset($object->cid) ? $object->cid : 0;
     case 'user':