diff --git a/template.typ b/template.typ
index 5430c48..c3b2294 100644
--- a/template.typ
+++ b/template.typ
@@ -461,10 +461,12 @@
 
     #context [
       #let pages = counter(page).final().at(0)
-      #let tables = counter(figure.where(kind: table)).final().at(0)
-      // alternative: query(figure.where(kind: image)).len()
-      #let images = counter(figure.where(kind: image)).final().at(0)
+      #let images = query(figure.where(kind: image)).len()
+      #let tables = query(figure.where(kind: table)).len()
       #let bibs = bib-count.final().dedup().len()
+      /* TODO: why this stopped working?
+      #let tables = counter(figure.where(kind: table)).final().at(0)
+      #let images = counter(figure.where(kind: image)).final().at(0)*/
 
       #let counters = ()