diff --git a/src/query.c b/src/query.c
index 1850c8d4..79635b38 100644
--- a/src/query.c
+++ b/src/query.c
@@ -834,14 +834,13 @@ bool drop_barrier(query *q, pl_idx cp)
 	if ((q->cp-1) != cp)
 		return false;
 
-	drop_choice(q);
-
 	if (q->cp) {
 		const choice *ch = GET_CURR_CHOICE();
 		frame *f = GET_CURR_FRAME();
-		f->chgen = ch->chgen;
+		f->chgen = ch->frame_chgen;
 	}
 
+	drop_choice(q);
 	return true;
 }