diff --git a/Packages/manifest.json b/Packages/manifest.json
index 5d56e686..f7fdaf5f 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "com.unity.collab-proxy": "1.10.2",
-    "com.unity.ide.rider": "3.0.15",
+    "com.unity.ide.rider": "3.0.16",
     "com.unity.ide.visualstudio": "2.0.11",
     "com.unity.ide.vscode": "1.2.4",
     "com.unity.test-framework": "1.1.29",
diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/AvatarObjectReferenceDrawer.cs b/Packages/net.fushizen.modular-avatar/Editor/Inspector/AvatarObjectReferenceDrawer.cs
index 179e1b2f..ca6497d1 100644
--- a/Packages/net.fushizen.modular-avatar/Editor/Inspector/AvatarObjectReferenceDrawer.cs
+++ b/Packages/net.fushizen.modular-avatar/Editor/Inspector/AvatarObjectReferenceDrawer.cs
@@ -9,21 +9,20 @@ namespace net.fushizen.modular_avatar.core.editor
     {
         public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
         {
-            if (!CustomGUI(position, property, label))
+            if (CustomGUI(position, property, label)) return;
+            
+            var xButtonSize = EditorStyles.miniButtonRight.CalcSize(new GUIContent("x"));
+            var xButtonRect = new Rect(position.xMax - xButtonSize.x, position.y, xButtonSize.x, position.height);
+            position = new Rect(position.x, position.y, position.width - xButtonSize.x, position.height);
+
+            property = property.FindPropertyRelative(nameof(AvatarObjectReference.referencePath));
+
+            position = EditorGUI.PrefixLabel(position, label);
+
+            using (var scope = new ZeroIndentScope())
             {
-                var xButtonSize = EditorStyles.miniButtonRight.CalcSize(new GUIContent("x"));
-                var xButtonRect = new Rect(position.xMax - xButtonSize.x, position.y, xButtonSize.x, position.height);
-                position = new Rect(position.x, position.y, position.width - xButtonSize.x, position.height);
-
-                property = property.FindPropertyRelative(nameof(AvatarObjectReference.referencePath));
-
-                position = EditorGUI.PrefixLabel(position, label);
-
-                using (var scope = new ZeroIndentScope())
-                {
-                    EditorGUI.LabelField(position,
-                        string.IsNullOrEmpty(property.stringValue) ? "(null)" : property.stringValue);
-                }
+                EditorGUI.LabelField(position,
+                    string.IsNullOrEmpty(property.stringValue) ? "(null)" : property.stringValue);
             }
         }
 
diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/BoneProxyEditor.cs b/Packages/net.fushizen.modular-avatar/Editor/Inspector/BoneProxyEditor.cs
index 01094ffe..e70bd41f 100644
--- a/Packages/net.fushizen.modular-avatar/Editor/Inspector/BoneProxyEditor.cs
+++ b/Packages/net.fushizen.modular-avatar/Editor/Inspector/BoneProxyEditor.cs
@@ -54,19 +54,19 @@ namespace net.fushizen.modular_avatar.core.editor
             {
                 var virtObj = new SerializedObject(objRefs);
                 var virtProp = virtObj.FindProperty(nameof(TempObjRef.target));
-            }
 
-            EditorGUI.BeginChangeCheck();
+                EditorGUI.BeginChangeCheck();
 
-            EditorGUILayout.PropertyField(virtProp, G("boneproxy.target"));
-            if (EditorGUI.EndChangeCheck())
-            {
-                virtObj.ApplyModifiedPropertiesWithoutUndo();
-                for (int i = 0; i < targets.Length; i++)
+                EditorGUILayout.PropertyField(virtProp, G("boneproxy.target"));
+                if (EditorGUI.EndChangeCheck())
                 {
-                    var t = (ModularAvatarBoneProxy) targets[i];
-                    Undo.RecordObjects(targets, "Set targets");
-                    t.target = ((TempObjRef) objRefs[i]).target;
+                    virtObj.ApplyModifiedPropertiesWithoutUndo();
+                    for (int i = 0; i < targets.Length; i++)
+                    {
+                        var t = (ModularAvatarBoneProxy) targets[i];
+                        Undo.RecordObjects(targets, "Set targets");
+                        t.target = ((TempObjRef) objRefs[i]).target;
+                    }
                 }
             }
 
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 3050d2a2..dc02f5bc 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -24,7 +24,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.15",
+      "version": "3.0.16",
       "depth": 0,
       "source": "registry",
       "dependencies": {