diff --git a/VERSION b/VERSION
index 953d2253..b25e0bdd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.1 (2012-08-29 10:12:06) rc4
+Version 2.00.1 (2012-08-29 10:27:58) rc4
diff --git a/applications/admin/languages/default.py b/applications/admin/languages/default.py
index a9bd0be9..5e7b0a7d 100644
--- a/applications/admin/languages/default.py
+++ b/applications/admin/languages/default.py
@@ -78,6 +78,7 @@
 'New simple application': 'New simple application',
 'Overwrite installed app': 'Overwrite installed app',
 'Pack all': 'Pack all',
+'Peeking at file': 'Peeking at file',
 'Plugins': 'Plugins',
 'plugins': 'plugins',
 'Plural-Forms:': 'Plural-Forms:',
diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index 20bfef25..32979bcc 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -1042,20 +1042,19 @@ class SQLFORM(FORM):
         # build a link
         if record and linkto:
             db = linkto.split('/')[-1]
-            for (rtable, rfield) in table._referenced_by:
+            for rfld in table._referenced_by:
                 if keyed:
-                    rfld = table._db[rtable][rfield]
                     query = urllib.quote('%s.%s==%s' % (db,rfld,record[rfld.type[10:].split('.')[1]]))
                 else:
-                    query = urllib.quote('%s.%s==%s' % (db,table._db[rtable][rfield],record[self.id_field_name]))
-                lname = olname = '%s.%s' % (rtable, rfield)
+                    query = urllib.quote('%s.%s==%s' % (db,rfld,record[self.id_field_name]))
+                lname = olname = '%s.%s' % (rfld.tablename, rfld.name)
                 if ofields and not olname in ofields:
                     continue
                 if labels and lname in labels:
                     lname = labels[lname]
                 widget = A(lname,
                            _class='reference',
-                           _href='%s/%s?query=%s' % (linkto, rtable, query))
+                           _href='%s/%s?query=%s' % (linkto, rfld.tablename, query))
                 xfields.append((olname.replace('.', '__')+SQLFORM.ID_ROW_SUFFIX,
                                 '',widget,col3.get(olname,'')))
                 self.custom.linkto[olname.replace('.', '__')] = widget
@@ -2218,9 +2217,9 @@ class SQLFORM(FORM):
                     del kwargs[key]
         check = {}
         id_field_name = table._id.name
-        for tablename,fieldname in table._referenced_by:
-            if db[tablename][fieldname].readable:
-                check[tablename] = check.get(tablename,[])+[fieldname]
+        for field in table._referenced_by:
+            if field.readable:
+                check[field.tablename] = check.get(field.tablename,[])+[field.name]
         for tablename in sorted(check):
             linked_fieldnames = check[tablename]
             tb = db[tablename]