diff --git a/src/common/gres.c b/src/common/gres.c
index ff87fbd1f857c0d778292795bba6a3ee34b7a09c..ce5dae4024517095ee8ddb9c273ae2ceb9966cc1 100644
--- a/src/common/gres.c
+++ b/src/common/gres.c
@@ -3111,9 +3111,7 @@ static uint32_t _job_test(void *job_gres_data, void *node_gres_data,
 			  int cpu_start_bit, int cpu_end_bit, bool *topo_set,
 			  uint32_t job_id, char *node_name, char *gres_name)
 {
-//	int i, j, cpu_size, cpus_ctld, gres_avail = 0, top_inx;
-int i, j, cpu_size, cpus_ctld, gres_avail = 0;
-static int top_inx;
+	int i, j, cpu_size, cpus_ctld, gres_avail = 0, top_inx;
 	gres_job_state_t  *job_gres_ptr  = (gres_job_state_t *)  job_gres_data;
 	gres_node_state_t *node_gres_ptr = (gres_node_state_t *) node_gres_data;
 	uint32_t *cpus_addnt = NULL;  /* Additional CPUs avail from this GRES */