1 files changed, 2 insertions, 2 deletions
diff --git a/entity.scm b/entity.scm
index 16d28c4..a655169 100644
--- a/entity.scm
+++ b/entity.scm
@@ -29,7 +29,7 @@
 
 (define (entity-set-many entity pairs)
   (fold (lambda (pair working-ent)
-	 (entity-set working-ent (car pair) (cdr pair)))
+	  (entity-set working-ent (car pair) (if (list? (cdr pair)) (cadr pair) (cdr pair))))
 	entity
 	pairs))
 
@@ -59,7 +59,7 @@
             (name     (car name-skip))
             (skip     (cadr name-skip))
             (formals  (caddr form))
-            (f1       (car formals))
+            (f1       (cadr formals))
             (rest     (cdddr form))
             (has-guard? (and (pair? rest) (pair? (cdr rest))
                              (eq? (car rest) guard:)))