diff --git a/src/main/java/eu/hbp/mip/controllers/StatsApi.java b/src/main/java/eu/hbp/mip/controllers/StatsApi.java
index 0e10c7ca2b1cef8b5703506b84cf021e5532c4ac..9513d91917baf94389beaf8c3c1100e28a33f3d7 100644
--- a/src/main/java/eu/hbp/mip/controllers/StatsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/StatsApi.java
@@ -56,8 +56,9 @@ public class StatsApi {
 
     private Long countVariables()
     {
-        LOGGER.warn("TEST DB : " + jdbcTemplate.queryForObject("select count(*) from information_schema.tables", Long.class));  // This is a test
-        Long count = jdbcTemplate.queryForObject("select count(*) from adni_merge", Long.class);  // TODO: compute from adni_merge DB
+        Long count = jdbcTemplate.queryForObject(
+                "SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS " +
+                        "WHERE table_schema = 'public' AND table_name = 'adni_merge'", Long.class);  // TODO: compute from adni_merge DB
         return count;
     }