diff --git a/src/minibuf.c b/src/minibuf.c
index cb302f44c43..d9fec427ec4 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1253,7 +1253,7 @@ is used to further constrain the set of candidates.  */)
 	}
       else if (type == 2)
 	{
-	  if (XFASTINT (bucket) != 0)
+	  if (!EQ (bucket, make_number (0)))
 	    {
 	      elt = bucket;
 	      eltstring = Fsymbol_name (elt);
@@ -1509,7 +1509,7 @@ are ignored unless STRING itself starts with a space.  */)
 	}
       else if (type == 2)
 	{
-	  if (XFASTINT (bucket) != 0)
+	  if (!EQ (bucket, make_number (0)))
 	    {
 	      elt = bucket;
 	      eltstring = Fsymbol_name (elt);