diff --git a/lib/chibi/match.sld b/lib/chibi/match.sld
index e389341d..36a652b1 100644
--- a/lib/chibi/match.sld
+++ b/lib/chibi/match.sld
@@ -1,6 +1,7 @@
 
 (define-library (chibi match)
   (export match match-lambda match-lambda* match-let match-letrec match-let*)
-  (import (chibi))
+  (cond-expand
+   (chibi (import (chibi)))
+   (else (import (scheme base))))
   (include "match/match.scm"))
-
diff --git a/lib/chibi/match/match.scm b/lib/chibi/match/match.scm
index 1efd67f4..3f63bfd9 100644
--- a/lib/chibi/match/match.scm
+++ b/lib/chibi/match/match.scm
@@ -522,9 +522,9 @@
      ;; remaining list length so we don't need any backtracking
      (match-verify-no-ellipses
       r
-      (let* ((tail-len (length* 'r))
+      (let* ((tail-len (length 'r))
              (ls v)
-             (len (and (list? ls) (length* ls))))
+             (len (and (list? ls) (length ls))))
         (if (or (not len) (< len tail-len))
             fk
             (let loop ((ls ls) (n len) (id-ls '()) ...)