diff --git a/ChangeLog b/ChangeLog
index 2e936b0a..b411c7e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-13  Akim Demaille  <akim@epita.fr>
+
+	* src/closure.c (closure): Use nrules instead of playing tricks
+	with BITS_PER_WORD.
+
 2001-12-13  Akim Demaille  <akim@epita.fr>
 
 	* src/print.c (print_actions): Output the handling of `$' as the
diff --git a/src/closure.c b/src/closure.c
index 77ca72c8..12bb5817 100644
--- a/src/closure.c
+++ b/src/closure.c
@@ -220,7 +220,7 @@ closure (short *core, int n)
 
   nitemset = 0;
   c = 0;
-  for (ruleno = 0; ruleno < rulesetsize * BITS_PER_WORD; ++ruleno)
+  for (ruleno = 0; ruleno < nrules + 1; ++ruleno)
     if (BITISSET (ruleset, ruleno))
       {
 	int itemno = rule_table[ruleno].rhs;