diff --git a/Assets/BetterCommons/Editor/Drawers/Container/ElementsContainer.cs b/Assets/BetterCommons/Editor/Drawers/Container/ElementsContainer.cs
index 46ab05c..86becb8 100644
--- a/Assets/BetterCommons/Editor/Drawers/Container/ElementsContainer.cs
+++ b/Assets/BetterCommons/Editor/Drawers/Container/ElementsContainer.cs
@@ -119,8 +119,10 @@ private void ScheduleUpdateGeometry(GeometryChangedEvent changedEvent)
         private void OnGeometryChanged(VisualElement element)
         {
             var propertyPath = SerializedProperty.propertyPath;
-            var builder = element.Query<PropertyField>().Where(field => field.bindingPath.CompareOrdinal(propertyPath)).Build();
-            var label = builder.First().Query<Label>().Class(PropertyField.labelUssClassName).First();
+            var propertyFields = element.Query<PropertyField>().Where(field => field.bindingPath.CompareOrdinal(propertyPath)).Build();
+            var parentField = propertyFields.First();
+            var labels = parentField.Query<Label>().Class(PropertyField.labelUssClassName).Where(field => field.parent.Equals(parentField));
+            var label = labels.First();
             if (label != null)
             {
                 LabelContainer.Setup(label);
diff --git a/Assets/BetterCommons/package.json b/Assets/BetterCommons/package.json
index c8554a1..361908d 100644
--- a/Assets/BetterCommons/package.json
+++ b/Assets/BetterCommons/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.tdw.better.commons",
   "displayName": "Better Commons",
-  "version": "0.0.36",
+  "version": "0.0.37",
   "unity": "2021.3",
   "description": " ",
   "dependencies": {