diff --git a/src/clos/defclass.lsp b/src/clos/defclass.lsp
index fe70eec66..41590be9e 100644
--- a/src/clos/defclass.lsp
+++ b/src/clos/defclass.lsp
@@ -83,7 +83,7 @@
 		 (setf option-name :direct-default-initargs)
 		 (parse-default-initargs (rest option)))
 		(otherwise
-		 (or (last option-name 0) (last option-name)))))
+		 (list 'quote (rest option)))))
 	(setf options (list* option-name option-value options))))
     `(eval-when (compile load eval)
       (ensure-class ',name :direct-superclasses ',superclasses