diff --git a/VERSION b/VERSION
index 232414f3..d5ffe6ab 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.07.31.11.44.33
+Version 2.6.0-development+timestamp.2013.08.01.01.59.18
diff --git a/gluon/dal.py b/gluon/dal.py
index 29714a33..9e6a0ab3 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -2058,7 +2058,6 @@ class BaseAdapter(ConnectionPool):
 
     def parse(self, rows, fields, colnames, blob_decode=True,
               cacheable = False):
-        self.build_parsemap()
         db = self.db
         virtualtables = []
         new_rows = []
@@ -7410,6 +7409,7 @@ class DAL(object):
                         types = ADAPTERS[self._dbname].types
                         # copy so multiple DAL() possible
                         self._adapter.types = copy.copy(types)
+                        self._adapter.build_parsemap()
                         if bigint_id:
                             if 'big-id' in types and 'reference' in types:
                                 self._adapter.types['id'] = types['big-id']