diff --git a/crypto/x509v3/v3_lib.c b/crypto/x509v3/v3_lib.c
index 482ca8ccf..ca5a4a4a5 100644
--- a/crypto/x509v3/v3_lib.c
+++ b/crypto/x509v3/v3_lib.c
@@ -202,6 +202,7 @@ void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit, int *idx)
 		if(OBJ_obj2nid(ex->object) == nid) {
 			if(idx) {
 				*idx = i;
+				found_ex = ex;
 				break;
 			} else if(found_ex) {
 				/* Found more than one */