diff --git a/src/gates/gmimc.rs b/src/gates/gmimc.rs
index c9cb4c75..73fcc190 100644
--- a/src/gates/gmimc.rs
+++ b/src/gates/gmimc.rs
@@ -367,7 +367,7 @@ mod tests {
         generate_partial_witness(
             &mut witness,
             &generators,
-            33,
+            130,
             100,
             100,
             &mut TimingTree::default(),
diff --git a/src/iop/challenger.rs b/src/iop/challenger.rs
index 45a3ffd3..886fb09e 100644
--- a/src/iop/challenger.rs
+++ b/src/iop/challenger.rs
@@ -413,9 +413,9 @@ mod tests {
         generate_partial_witness(
             &mut witness,
             &circuit.prover_only.generators,
-            33,
-            100,
-            100,
+            130,
+            1000,
+            1000,
             &mut TimingTree::default(),
         );
         let recursive_output_values_per_round: Vec<Vec<F>> = recursive_outputs_per_round
diff --git a/src/iop/generator.rs b/src/iop/generator.rs
index 8bfd57a7..6ab1b412 100644
--- a/src/iop/generator.rs
+++ b/src/iop/generator.rs
@@ -16,15 +16,15 @@ use crate::util::timing::TimingTree;
 pub(crate) fn generate_partial_witness<F: Field>(
     witness: &mut PartialWitness<F>,
     generators: &[Box<dyn WitnessGenerator<F>>],
-    num_routed_wires: usize,
+    num_wires: usize,
     degree: usize,
     max_virtual_target: usize,
     timing: &mut TimingTree,
 ) {
     let target_index = |t: Target| -> usize {
         match t {
-            Target::Wire(Wire { gate, input }) => gate * num_routed_wires + input,
-            Target::VirtualTarget { index } => degree * num_routed_wires + index,
+            Target::Wire(Wire { gate, input }) => gate * num_wires + input,
+            Target::VirtualTarget { index } => degree * num_wires + index,
         }
     };
     let max_target_index = target_index(Target::VirtualTarget {
diff --git a/src/plonk/prover.rs b/src/plonk/prover.rs
index 9364ce1e..42e66372 100644
--- a/src/plonk/prover.rs
+++ b/src/plonk/prover.rs
@@ -40,7 +40,7 @@ pub(crate) fn prove<F: Extendable<D>, const D: usize>(
         generate_partial_witness(
             &mut partial_witness,
             &prover_data.generators,
-            config.num_routed_wires,
+            config.num_wires,
             degree,
             prover_data.max_virtual_target_index,
             &mut timing