diff --git a/fuzzers/071-ppips/generate.tcl b/fuzzers/071-ppips/generate.tcl
index 2c92afd6..4dd8b5a1 100644
--- a/fuzzers/071-ppips/generate.tcl
+++ b/fuzzers/071-ppips/generate.tcl
@@ -153,15 +153,21 @@ proc write_gtp_channel_ppips_db {filename tile tile_suffix} {
 
     foreach pip [get_pips -of_objects $tile] {
         set dst_wire [get_wires -downhill -of_objects $pip]
-        if {[get_pips -uphill -of_objects [get_nodes -of_objects $dst_wire]] == $pip} {
-            set src_wire [get_wires -uphill -of_objects $pip]
+        set src_wire [get_wires -uphill -of_objects $pip]
 
-            if {![regexp "IMUX" $src_wire] && ![regexp "GTPE2_CTRL" $src_wire] && ![regexp "GTPE2_CLK" $src_wire]} {
-                continue
-            }
-
-            puts $fp "${tile_type}${tile_suffix}.[regsub {.*/} $dst_wire ""].[regsub {.*/} $src_wire ""] always"
+        set logic_outs [regexp "LOGIC_OUTS" $dst_wire]
+        set imux [regexp "IMUX" $src_wire]
+        set ctrl [regexp "GTPE2_CTRL" $src_wire]
+        set clk [regexp "GTPE2_CLK" $src_wire]
+        set ibufds [regexp "IBUFDS" $src_wire]
+        set refclk [regexp "COMMON_REFCLK" $src_wire]
+        set tx_pads [regexp "TX\[NP\]_PAD" $dst_wire]
+        set rx_pads [regexp "RX\[NP\]_PAD" $src_wire]
+        if {!$logic_outs && !$tx_pads && !$rx_pads && !$imux && !$ctrl && !$clk && !$refclk && !($ibufds && $tile_suffix == "")} {
+            continue
         }
+
+        puts $fp "${tile_type}${tile_suffix}.[regsub {.*/} $dst_wire ""].[regsub {.*/} $src_wire ""] always"
     }
 
     close $fp
@@ -176,10 +182,6 @@ proc write_gtp_int_interface_ppips_db {filename tile} {
         set dst_wire [get_wires -downhill -of_objects $pip]
         set src_wire [get_wires -uphill -of_objects $pip]
 
-        if {![regexp "IMUX_OUT" $dst_wire]} {
-            continue
-        }
-
         if {[regexp "DELAY" $src_wire]} {
             continue
         }