diff --git a/Objects/setobject.c b/Objects/setobject.c
index 23ab95c..8197cd9 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -84,8 +84,9 @@
                 return set_lookkey(so, key, hash);
             if (cmp > 0)                                          /* likely */
                 return entry;
+            mask = so->mask;                 /* help avoid a register spill */
         }
-        if (entry->key == dummy && freeslot == NULL)
+        if (entry->hash == -1 && freeslot == NULL)
             freeslot = entry;
 
         if (i + LINEAR_PROBES <= mask) {
@@ -111,8 +112,9 @@
                         return set_lookkey(so, key, hash);
                     if (cmp > 0)
                         return entry;
+                    mask = so->mask;
                 }
-                if (entry->key == dummy && freeslot == NULL)
+                if (entry->hash == -1 && freeslot == NULL)
                     freeslot = entry;
             }
         }
