diff --git a/VERSION b/VERSION
index 1c80a83d..2d4db54a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-05-21 09:55:00) dev
+Version 2.00.0 (2012-05-21 10:08:41) dev
diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index 981f0167..78942d11 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -1323,7 +1323,7 @@ class SQLFORM(FORM):
     def smartdictform(session,name,filename=None,query=None,**kwargs):
         import os
         if query:
-            session[name] = db(query).select().first().as_dict()
+            session[name] = query.db(query).select().first().as_dict()
         elif os.path.exists(filename):
             env = {'datetime':datetime}
             session[name] = eval(open(filename).read(),{},env)
@@ -1331,7 +1331,7 @@ class SQLFORM(FORM):
         if form.process().accepted:
             session[name].update(form.vars)
             if query:
-                db(query).update(**form.vars)
+                query.db(query).update(**form.vars)
             else:
                 open(filename,'w').write(repr(session[name]))
         return form