diff --git a/src/plugins/slurmctld/nonstop/do_work.c b/src/plugins/slurmctld/nonstop/do_work.c
index 671789d03e20449e655a9d520d6f31a851d3aa9e..0b654eab7a9a06cb7d0a0fffb877bd18df68fdcc 100644
--- a/src/plugins/slurmctld/nonstop/do_work.c
+++ b/src/plugins/slurmctld/nonstop/do_work.c
@@ -882,7 +882,7 @@ static char *_job_node_features(struct job_record *job_ptr,
 	node_inx = node_ptr - node_record_table_ptr;
 	job_iter = list_iterator_create(job_ptr->details->feature_list);
 	while ((job_feat_ptr = (job_feature_t *) list_next(job_iter))) {
-		node_iter = list_iterator_create(avail_feature_list);
+		node_iter = list_iterator_create(active_feature_list);
 		while ((node_feat_ptr = (node_feature_t *)
 					list_next(node_iter))) {
 			if (!job_feat_ptr->name  ||
diff --git a/src/slurmctld/step_mgr.c b/src/slurmctld/step_mgr.c
index d584cf0f71d44a2cca7682e8fe689d51493669b5..d297e6a6bf4537925869392390b94a71ebf98afe 100644
--- a/src/slurmctld/step_mgr.c
+++ b/src/slurmctld/step_mgr.c
@@ -936,7 +936,7 @@ _pick_step_nodes (struct job_record  *job_ptr,
 		/* We only select for a single feature name here.
 		 * FIXME: Add support for AND, OR, etc. here if desired */
 		node_feature_t *feat_ptr;
-		feat_ptr = list_find_first(avail_feature_list,
+		feat_ptr = list_find_first(active_feature_list,
 					   list_find_feature,
 					   (void *) step_spec->features);
 		if (feat_ptr && feat_ptr->node_bitmap)