--- faq.module.old	2008-02-19 10:38:39.000000000 +0000
+++ faq.module	2008-02-20 11:52:31.000000000 +0000
@@ -251,9 +251,10 @@
  *   The node object.
  */
 function faq_load($node) {
-  $result = db_fetch_object(db_query('SELECT question FROM {faq_questions} WHERE nid = %d', $node->nid));
+  $result = db_fetch_object(db_query('SELECT question FROM {faq_questions} WHERE nid = %d AND vid = %d', $node->nid, $node->vid));
   $node->question = $result->question;
   $node->title = $node->question;
+  return($node);
 }
 
 /**