diff --git a/init.c b/init.c
index 23fe8dc..b4b4abe 100644
--- a/init.c
+++ b/init.c
@@ -425,7 +425,8 @@
 	td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
 	td->ts.bw_stat[0].min_val = td->ts.bw_stat[1].min_val = ULONG_MAX;
 
-	if ((td->o.stonewall || td->o.numjobs > 1) && prev_group_jobs) {
+	if ((td->o.stonewall || td->o.numjobs > 1 || td->o.new_group)
+	     && prev_group_jobs) {
 		prev_group_jobs = 0;
 		groupid++;
 	}
@@ -498,11 +499,6 @@
 			goto err;
 	}
 
-	if (td->o.numjobs > 1) {
-		groupid++;
-		prev_group_jobs = 0;
-	}
-
 	return 0;
 err:
 	put_job(td);