diff --git a/VERSION b/VERSION
index 8477ccdf..a1f7d9b7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.5.1-stable+timestamp.2013.06.24.14.23.41
+Version 2.5.1-stable+timestamp.2013.06.25.09.09.16
diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index cb1c1f3b..2f99adc5 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -2615,7 +2615,7 @@ class SQLFORM(FORM):
         except (KeyError, ValueError, TypeError):
             redirect(URL(args=table._tablename))
         if nargs == len(args) + 1:
-            query = table._id != None
+            query = table._db._adapter.id_query(table)
 
         # filter out data info for displayed table
         if table._tablename in constraints: