diff --git a/startup.4th b/startup.4th
index bfbb9f6..8e5b13b 100644
--- a/startup.4th
+++ b/startup.4th
@@ -1763,7 +1763,7 @@ BOOTSTRAP-GET-ORDER SET-ORDER
 \ If the name is an immediate word return the execution token with status -1
 \ Otherwise return the execution token with status 1
 : SEARCH-WORDLIST ( c-addr u wid -- c-addr u 0 | xt 1 | xt -1 )
-   0 SWAP {
+   SWAP F_LENMASK UMIN 0 ROT {
      >R DROP 2DUP R@ >NAME COMPARE 0= IF
        2DROP R> DUP IMMEDIATE? 1 OR TRUE
      ELSE