diff --git a/fuzzers/000-init-db/Makefile b/fuzzers/000-init-db/Makefile
index ee42445a..d1eec21c 100644
--- a/fuzzers/000-init-db/Makefile
+++ b/fuzzers/000-init-db/Makefile
@@ -39,10 +39,11 @@ DB_SIMPLE=\
     $(addsuffix _r, $(DB_SIMPLE_LR) $(DB_SIMPLE_R)) \
     segbits_cmt_top_l_upper_t \
     segbits_cmt_top_r_upper_t \
-	segbits_lioi3 \
-	segbits_rioi3 \
-	segbits_liob33 \
-	segbits_riob33
+    segbits_lioi3 \
+    segbits_rioi3 \
+    segbits_liob33 \
+    segbits_riob33 \
+    segbits_hclk_ioi3 \
 
 BLOCK_RAM_EXTRA_FOR=\
       mask_bram \
diff --git a/fuzzers/047-hclk-ioi-pips/generate.py b/fuzzers/047-hclk-ioi-pips/generate.py
index cd87f62a..e6471c87 100644
--- a/fuzzers/047-hclk-ioi-pips/generate.py
+++ b/fuzzers/047-hclk-ioi-pips/generate.py
@@ -63,9 +63,6 @@ def main():
                 tiledata[tile]["srcs"].add(dst)
                 tiledata[tile]["dsts"].add(src)
 
-            if pnum == 1 or pdir == 0:
-                ignpip.add((src, dst))
-
     for tile, pips_srcs_dsts in tiledata.items():
         tile_type = pips_srcs_dsts["type"]
         pips = pips_srcs_dsts["pips"]
diff --git a/fuzzers/047-hclk-ioi-pips/hclk_ioi3_pip_list.tcl b/fuzzers/047-hclk-ioi-pips/hclk_ioi3_pip_list.tcl
index afcb74d7..36d1e7af 100644
--- a/fuzzers/047-hclk-ioi-pips/hclk_ioi3_pip_list.tcl
+++ b/fuzzers/047-hclk-ioi-pips/hclk_ioi3_pip_list.tcl
@@ -18,7 +18,10 @@ proc print_tile_pips {tile_type filename} {
                 continue
             }
 
-            if {[llength [get_nodes -uphill -of_objects $dst_node]] > 1} {
+            set dst_wire [regsub {.*/} $dst ""]
+            set dst_match [regexp {HCLK_IOI_CK_IGCLK[0-9]+} $dst_wire]
+
+            if {[llength [get_nodes -uphill -of_objects $dst_node]] > 1 || $dst_match} {
                 set pip_string "$tile_type.[regsub {.*/} $dst ""].[regsub {.*/} $src ""]"
                 if ![dict exists $pips $pip_string] {
                     puts $fp $pip_string