diff --git a/changelog b/changelog
index 6de1996..f7729b8 100644
--- a/changelog
+++ b/changelog
@@ -35,6 +35,8 @@ export (QQ's a zone into a tarball)t
 Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist)
 (lots of major bugfixes too)
 tbaMUD 3.59
+[Feb 11 2009] - Jamdog
+  Fixed a crash bug in count_quests (quest.c) affecting zlist (thanks Fsantin)
 [Feb 05 2009] - Jamdog
   Added "set <player> name <newname>", which renames a character, including pfile and index entry
 [Feb 01 2009] - Jamdog
diff --git a/src/quest.c b/src/quest.c
index 403a251..81d6ae8 100644
--- a/src/quest.c
+++ b/src/quest.c
@@ -118,8 +118,11 @@ int count_quests(qst_vnum low, qst_vnum high)
 {
   int i, j;
 
-  for (i = j = 0; QST_NUM(i) <= high; i++)
-    if (QST_NUM(i) >= low)
+  if (!aquest_table)
+    return 0;
+
+  for (i = j = 0; i < total_quests; i++)
+    if (QST_NUM(i) >= low && QST_NUM(i) <= high)
       j++;
 
   return j;