diff --git a/VERSION b/VERSION
index 6028f9ba..def0b906 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-08-07 16:33:36) dev
+Version 2.00.0 (2012-08-07 16:40:52) dev
diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index 20c0a747..59c8143b 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -2014,9 +2014,9 @@ class SQLFORM(FORM):
                                           _href='%s/%s' % (upload, value))
                         else:
                             value = ''
-                    elif isinstance(value,str):
+                    if isinstance(value,str):
                         value = truncate_string(value,maxlength)
-                    else:
+                    elif not isinstance(value,DIV):
                         value = field.formatter(value)
                     tr.append(TD(value))
                 row_buttons = TD(_class='row_buttons')