diff --git a/lib/hx509/ks_p11.c b/lib/hx509/ks_p11.c
index 4e03edf7f..c8c6055c1 100644
--- a/lib/hx509/ks_p11.c
+++ b/lib/hx509/ks_p11.c
@@ -506,7 +506,8 @@ collect_cert(struct p11_module *p, struct p11_slot *slot,
     if (ret)
 	return ret;
 
-    _hx509_set_cert_attribute(cert,
+    _hx509_set_cert_attribute(ctx->context,
+			      cert,
 			      oid_id_pkcs_9_at_localKeyId(),
 			      &localKeyId);
 
diff --git a/lib/hx509/ks_p12.c b/lib/hx509/ks_p12.c
index b3a568f06..5f606f820 100644
--- a/lib/hx509/ks_p12.c
+++ b/lib/hx509/ks_p12.c
@@ -164,7 +164,7 @@ certBag_parser(hx509_context context,
 	    const heim_oid *oid = (*(oids[i]))();
 	    attr = find_attribute(attrs, oid);
 	    if (attr)
-		_hx509_set_cert_attribute(cert, oid, &attr->attrValues);
+		_hx509_set_cert_attribute(context, cert, oid, &attr->attrValues);
 	}	
     }
     return 0;