diff --git a/fuzzers/005-tilegrid/Makefile b/fuzzers/005-tilegrid/Makefile
index ee51b3c9..df2b9ba0 100644
--- a/fuzzers/005-tilegrid/Makefile
+++ b/fuzzers/005-tilegrid/Makefile
@@ -1,6 +1,6 @@
 FUZDIR=$(shell pwd)
 BUILD_DIR=$(FUZDIR)/build
-TILEGRID_TDB_DEPENDENCIES=iob/build/segbits_tilegrid.tdb mmcm/build/segbits_tilegrid.tdb pll/build/segbits_tilegrid.tdb
+TILEGRID_TDB_DEPENDENCIES=iob/build/segbits_tilegrid.tdb mmcm/build/segbits_tilegrid.tdb pll/build/segbits_tilegrid.tdb monitor/build/segbits_tilegrid.tdb
 GENERATE_FULL_ARGS=
 
 ifeq (${XRAY_DATABASE}, zynq7)
@@ -10,7 +10,7 @@ endif
 
 database: build/tilegrid.json
 
-pushdb:
+pushdb: build/tilegrid.json
 	cp build/tilegrid.json ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/tilegrid.json
 
 build/tiles/tiles.txt:
@@ -44,7 +44,6 @@ pll/build/segbits_tilegrid.tdb: build/basicdb/tilegrid.json
 ps7_int/build/segbits_tilegrid.tdb: build/basicdb/tilegrid.json
 	cd ps7_int && $(MAKE)
 
-# FIXME: add monitor to ROI
 monitor/build/segbits_tilegrid.tdb: build/basicdb/tilegrid.json
 	cd monitor && $(MAKE)
 
diff --git a/fuzzers/005-tilegrid/add_tdb.py b/fuzzers/005-tilegrid/add_tdb.py
index 65a306e1..7d1dee99 100644
--- a/fuzzers/005-tilegrid/add_tdb.py
+++ b/fuzzers/005-tilegrid/add_tdb.py
@@ -57,13 +57,9 @@ def run(fn_in, fn_out, verbose=False):
         ("mmcm/build/segbits_tilegrid.tdb", 30, 101),
         # FIXME: height
         ("pll/build/segbits_tilegrid.tdb", 30, 101),
+        ("monitor/build/segbits_tilegrid.tdb", 30, 101),
     ]
 
-    # FIXME: support XADC in ROI
-    if os.path.exists("monitor/build/segbits_tilegrid.tdb"):
-        # FIXME: height
-        tdb_fns.append(("monitor/build/segbits_tilegrid.tdb", 30, 101))
-
     for (tdb_fn, frames, words) in tdb_fns:
         for (tile, frame, wordidx) in load_db(tdb_fn):
             tilej = database[tile]
diff --git a/fuzzers/005-tilegrid/monitor/top.py b/fuzzers/005-tilegrid/monitor/top.py
index 11955699..e9b31d48 100644
--- a/fuzzers/005-tilegrid/monitor/top.py
+++ b/fuzzers/005-tilegrid/monitor/top.py
@@ -2,13 +2,19 @@ import os
 import random
 random.seed(int(os.getenv("SEED"), 16))
 from prjxray import util
-from prjxray import verilog
+from prjxray.db import Database
 
 
 def gen_sites():
-    # yield ("MONITOR_BOT_X46Y79", "XADC_X0Y0")
-    for tile_name, site_name, _site_type in util.get_roi().gen_sites(['XADC']):
-        yield tile_name, site_name
+    db = Database(util.get_db_root())
+    grid = db.grid()
+    for tile_name in grid.tiles():
+        loc = grid.loc_of_tilename(tile_name)
+        gridinfo = grid.gridinfo_at_loc(loc)
+
+        for site_name, site_type in gridinfo.sites.items():
+            if site_type in ['XADC']:
+                yield tile_name, site_name
 
 
 def write_params(params):