diff --git a/module/oop/goops/compile.scm b/module/oop/goops/compile.scm
index e6b13c416..732c1bccd 100644
--- a/module/oop/goops/compile.scm
+++ b/module/oop/goops/compile.scm
@@ -34,11 +34,12 @@
 
 (define code-table-lookup
   (letrec ((check-entry (lambda (entry types)
-			  (if (null? types)
-			      (and (not (struct? (car entry)))
-				   entry)
-			      (and (eq? (car entry) (car types))
-				   (check-entry (cdr entry) (cdr types)))))))
+                          (cond
+                           ((not (pair? entry)) (and (null? types) entry))
+                           ((null? types) #f)
+                           (else
+                            (and (eq? (car entry) (car types))
+                                 (check-entry (cdr entry) (cdr types))))))))
     (lambda (code-table types)
       (cond ((null? code-table) #f)
 	    ((check-entry (car code-table) types))
diff --git a/test-suite/tests/goops.test b/test-suite/tests/goops.test
index 2317228e4..7cdc396aa 100644
--- a/test-suite/tests/goops.test
+++ b/test-suite/tests/goops.test
@@ -261,6 +261,19 @@
              (method-more-specific? m1 m2 '()))
           (current-module))))
 
+(with-test-prefix "the method cache"
+  (pass-if "defining a method with a rest arg"
+    (let ((m (current-module)))
+      (eval '(define-method (foo bar . baz)
+               (cons bar baz))
+            m)
+      (eval '(foo 1)
+            m)
+      (eval '(foo 1 2)
+            m)
+      (eval '(equal? (foo 1 2) '(1 2))
+            m))))
+
 (with-test-prefix "defining accessors"
 
   (with-test-prefix "define-accessor"