diff --git a/includes/dhcpd.h b/includes/dhcpd.h

index 52ba677..deea2a7 100644

--- a/includes/dhcpd.h

+++ b/includes/dhcpd.h

@@ -1521,8 +1521,9 @@ struct iasubopt {

  */

 #define EXPIRED_IPV6_CLEANUP_TIME (60*60)

-	int heap_index;				/* index into heap, or -1

-						   (internal use only) */

+	/* index into heaps, or -1 (internal use only) */

+	int active_index;

+	int inactive_index;

 	/*

 	 * A pointer to the state of the ddns update for this lease.

diff --git a/server/mdb6.c b/server/mdb6.c

index 0e76264..711ab3d 100644

--- a/server/mdb6.c

+++ b/server/mdb6.c

@@ -130,7 +130,8 @@ iasubopt_allocate(struct iasubopt **iasubopt, const char *file, int line) {

 	tmp->refcnt = 1;

 	tmp->state = FTS_FREE;

-	tmp->heap_index = -1;

+	tmp->active_index = -1;

+	tmp->inactive_index = -1;

 	tmp->plen = 255;

 	*iasubopt = tmp;

@@ -504,10 +505,14 @@ lease_older(void *a, void *b) {

  * Callback when an address's position in the heap changes.

  */

 static void

-lease_index_changed(void *iasubopt, unsigned int new_heap_index) {

-	((struct iasubopt *)iasubopt)-> heap_index = new_heap_index;

+active_changed(void *iasubopt, unsigned int new_heap_index) {

+	((struct iasubopt *)iasubopt)-> active_index = new_heap_index;

 }

+static void

+inactive_changed(void *iasubopt, unsigned int new_heap_index) {

+	((struct iasubopt *)iasubopt)-> inactive_index = new_heap_index;

+}

 /*

  * Create a new IPv6 lease pool structure.

@@ -544,13 +549,13 @@ ipv6_pool_allocate(struct ipv6_pool **pool, u_int16_t type,

 		dfree(tmp, file, line);

 		return ISC_R_NOMEMORY;

 	}

-	if (isc_heap_create(dhcp_gbl_ctx.mctx, lease_older, lease_index_changed,

+	if (isc_heap_create(dhcp_gbl_ctx.mctx, lease_older, active_changed,

 			    0, &(tmp->active_timeouts)) != ISC_R_SUCCESS) {

 		iasubopt_free_hash_table(&(tmp->leases), file, line);

 		dfree(tmp, file, line);

 		return ISC_R_NOMEMORY;

 	}

-	if (isc_heap_create(dhcp_gbl_ctx.mctx, lease_older, lease_index_changed,

+	if (isc_heap_create(dhcp_gbl_ctx.mctx, lease_older, inactive_changed,

 			    0, &(tmp->inactive_timeouts)) != ISC_R_SUCCESS) {

 		isc_heap_destroy(&(tmp->active_timeouts));

 		iasubopt_free_hash_table(&(tmp->leases), file, line);

@@ -1045,7 +1050,7 @@ cleanup_lease6(ia_hash_t *ia_table,

 	 * Remove the old lease from the active heap and from the hash table

 	 * then remove the lease from the IA and clean up the IA if necessary.

 	 */

-	isc_heap_delete(pool->active_timeouts, test_iasubopt->heap_index);

+	isc_heap_delete(pool->active_timeouts, test_iasubopt->active_index);

 	pool->num_active--;

 	iasubopt_hash_delete(pool->leases, &test_iasubopt->addr,

@@ -1110,11 +1115,11 @@ add_lease6(struct ipv6_pool *pool, struct iasubopt *lease,

 		if ((test_iasubopt->state == FTS_ACTIVE) ||

 		    (test_iasubopt->state == FTS_ABANDONED)) {

 			isc_heap_delete(pool->active_timeouts,

-					test_iasubopt->heap_index);

+					test_iasubopt->active_index);

 			pool->num_active--;

 		} else {

 			isc_heap_delete(pool->inactive_timeouts,

-					test_iasubopt->heap_index);

+					test_iasubopt->inactive_index);

 			pool->num_inactive--;

 		}

@@ -1225,14 +1230,13 @@ lease6_usable(struct iasubopt *lease) {

 static isc_result_t

 move_lease_to_active(struct ipv6_pool *pool, struct iasubopt *lease) {

 	isc_result_t insert_result;

-	int old_heap_index;

-	old_heap_index = lease->heap_index;

 	insert_result = isc_heap_insert(pool->active_timeouts, lease);

 	if (insert_result == ISC_R_SUCCESS) {

        		iasubopt_hash_add(pool->leases, &lease->addr, 

 				  sizeof(lease->addr), lease, MDL);

-		isc_heap_delete(pool->inactive_timeouts, old_heap_index);

+		isc_heap_delete(pool->inactive_timeouts,

+				lease->inactive_index);

 		pool->num_active++;

 		pool->num_inactive--;

 		lease->state = FTS_ACTIVE;

@@ -1278,16 +1282,16 @@ renew_lease6(struct ipv6_pool *pool, struct iasubopt *lease) {

 	if (lease->state == FTS_ACTIVE) {

 		if (old_end_time <= lease->hard_lifetime_end_time) {

 			isc_heap_decreased(pool->active_timeouts,

-					   lease->heap_index);

+					   lease->active_index);

 		} else {

 			isc_heap_increased(pool->active_timeouts,

-					   lease->heap_index);

+					   lease->active_index);

 		}

 		return ISC_R_SUCCESS;

 	} else if (lease->state == FTS_ABANDONED) {

 		char tmp_addr[INET6_ADDRSTRLEN];

                 lease->state = FTS_ACTIVE;

-                isc_heap_increased(pool->active_timeouts, lease->heap_index);

+                isc_heap_increased(pool->active_timeouts, lease->active_index);

 		log_info("Reclaiming previously abandoned address %s",

 			 inet_ntop(AF_INET6, &(lease->addr), tmp_addr,

 				   sizeof(tmp_addr)));

@@ -1304,9 +1308,7 @@ static isc_result_t

 move_lease_to_inactive(struct ipv6_pool *pool, struct iasubopt *lease, 

 		       binding_state_t state) {

 	isc_result_t insert_result;

-	int old_heap_index;

-	old_heap_index = lease->heap_index;

 	insert_result = isc_heap_insert(pool->inactive_timeouts, lease);

 	if (insert_result == ISC_R_SUCCESS) {

 #if defined (NSUPDATE)

@@ -1325,7 +1327,7 @@ move_lease_to_inactive(struct ipv6_pool *pool, struct iasubopt *lease,

 		iasubopt_hash_delete(pool->leases, 

 				     &lease->addr, sizeof(lease->addr), MDL);

-		isc_heap_delete(pool->active_timeouts, old_heap_index);

+		isc_heap_delete(pool->active_timeouts, lease->active_index);

 		lease->state = state;

 		pool->num_active--;

 		pool->num_inactive++;

@@ -1390,7 +1392,7 @@ decline_lease6(struct ipv6_pool *pool, struct iasubopt *lease) {

 	}

 	lease->state = FTS_ABANDONED;

 	lease->hard_lifetime_end_time = MAX_TIME;

-	isc_heap_decreased(pool->active_timeouts, lease->heap_index);

+	isc_heap_decreased(pool->active_timeouts, lease->active_index);

 	return ISC_R_SUCCESS;

 }

@@ -1663,7 +1665,7 @@ cleanup_old_expired(struct ipv6_pool *pool) {

 			break;

 		}

-		isc_heap_delete(pool->inactive_timeouts, tmp->heap_index);

+		isc_heap_delete(pool->inactive_timeouts, tmp->inactive_index);

 		pool->num_inactive--;

 		if (tmp->ia != NULL) {