diff --git a/pybis/src/python/pybis/property.py b/pybis/src/python/pybis/property.py
index 9dd9bf6c31f89a0868f743a03e04f97868aa485e..9d2a6431abf9304559c0fb9ddae52bf6b2e89f2f 100644
--- a/pybis/src/python/pybis/property.py
+++ b/pybis/src/python/pybis/property.py
@@ -60,7 +60,7 @@ class PropertyHolder():
             if name in self._property_names:
                 property_type = self._property_names[name]
                 if property_type['dataType'] == 'CONTROLLEDVOCABULARY':
-                    return self._get_terms(property_type['vocabulary']['code'])
+                    return self._get_terms(property_type['code'])
                 else:
                     syntax = { property_type["label"] : property_type["dataType"]}
                     if property_type["dataType"] == "TIMESTAMP":
@@ -82,7 +82,7 @@ class PropertyHolder():
         property_type = self._property_names[name]
         data_type = property_type['dataType']
         if data_type == 'CONTROLLEDVOCABULARY':
-            voc = self._get_terms(property_type['vocabulary']['code'])
+            voc = self._get_terms(property_type['code'])
             value = str(value).upper()
             if value not in voc.df['code'].values:
                 raise ValueError("Value for attribute {} must be one of these terms: {}".format(