diff --git a/netbox/extras/models.py b/netbox/extras/models.py
index 4bc9f3550..64e84ef66 100644
--- a/netbox/extras/models.py
+++ b/netbox/extras/models.py
@@ -71,9 +71,9 @@ class CustomFieldModel(object):
         """
         Name-based CustomFieldValue accessor for use in templates
         """
-        if not hasattr(self, 'custom_fields'):
+        if not hasattr(self, 'get_custom_fields'):
             return dict()
-        return {field.name: value for field, value in self.custom_fields.items()}
+        return {field.name: value for field, value in self.get_custom_fields().items()}
 
     def get_custom_fields(self):
         """
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index ef25ae84f..a7de9c47c 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -12,7 +12,7 @@ except ImportError:
                                "the documentation.")
 
 
-VERSION = '1.6.2-dev'
+VERSION = '1.6.1-r1'
 
 # Import local configuration
 for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY']: