diff --git a/VERSION b/VERSION
index 82e44bf8..e04ac15d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.1 (2012-08-27 15:29:22) rc4
+Version 2.00.1 (2012-08-27 16:16:20) rc4
diff --git a/gluon/globals.py b/gluon/globals.py
index 10c9a912..9e65c6c5 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -405,10 +405,15 @@ class Response(Storage):
             dbstats = [TABLE(*[TR(PRE(row[0]),'%.2fms' % (row[1]*1000)) \
                                    for row in i.db._timings]) \
                            for i in thread.instances]
-            dbtables = dict([(i.uri, [t for t in i.db.tables if t not in i.db._LAZY_TABLES])
+            dbtables = dict([(i.uri, {'defined': sorted(list(set(i.db.tables) - 
+                                                 set(i.db._LAZY_TABLES.keys()))) or
+                                                 '[no defined tables]',
+                                      'lazy': sorted(i.db._LAZY_TABLES.keys()) or
+                                              '[no lazy tables]'})
                              for i in thread.instances])
         else:
             dbstats = [] # if no db or on GAE
+            dbtables = {}
         u = web2py_uuid()
         return DIV(
             BUTTON('design',_onclick="document.location='%s'" % admin),