diff --git a/ice40/arch.cc b/ice40/arch.cc
index 23a2130c..4370b581 100644
--- a/ice40/arch.cc
+++ b/ice40/arch.cc
@@ -1021,7 +1021,7 @@ TimingPortClass Arch::getPortTimingClass(const CellInfo *cell, IdString port, in
         return TMG_IGNORE;
     } else if (cell->type == id_SB_GB) {
         if (port == id_GLOBAL_BUFFER_OUTPUT)
-            return TMG_COMB_OUTPUT;
+            return cell->gbInfo.forPadIn ? TMG_GEN_CLOCK : TMG_COMB_OUTPUT;
         return TMG_COMB_INPUT;
     } else if (cell->type == id_SB_WARMBOOT) {
         return TMG_ENDPOINT;
diff --git a/tests b/tests
index 691dfb82..baf928b5 160000
--- a/tests
+++ b/tests
@@ -1 +1 @@
-Subproject commit 691dfb8204131bec7f1c5e139764bf418640f941
+Subproject commit baf928b5c688d1d8409da28f76c36f74e79a93a8