diff --git a/VERSION b/VERSION
index 7252c8ca..6cb48b73 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.07.03.17.15.42
+Version 2.6.0-development+timestamp.2013.07.05.02.12.46
diff --git a/gluon/dal.py b/gluon/dal.py
index 11b246d0..f2592868 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -6869,8 +6869,11 @@ class Row(object):
 
     def __getitem__(self, k):
         key=str(k)
-        if key in self.get('_extra',{}):
-            return self._extra[key]
+        _extra = self.__dict__.get('_extra', None)
+        if _extra is not None:
+            v = _extra.get(key, None)
+            if v:
+                return v
         m = REGEX_TABLE_DOT_FIELD.match(key)
         if m:
             try: