diff --git a/VERSION b/VERSION
index e24d0d02..8cf93d31 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-05-28 12:59:43) dev
+Version 2.00.0 (2012-05-28 13:04:49) dev
diff --git a/gluon/html.py b/gluon/html.py
index 3972f432..b9e79219 100644
--- a/gluon/html.py
+++ b/gluon/html.py
@@ -2055,6 +2055,9 @@ class BEAUTIFY(DIV):
         if level == 0:
             return
         for c in self.components:
+            if hasattr(c,'value') and not callable(c.value):
+                if c.value:
+                    components.append(c.value)
             if hasattr(c,'xml') and callable(c.xml):
                 components.append(c)
                 continue