diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiMutableModelControllerBase.php b/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiMutableModelControllerBase.php
index d4d4dcd94..9dc50a606 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiMutableModelControllerBase.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiMutableModelControllerBase.php
@@ -297,7 +297,7 @@ abstract class ApiMutableModelControllerBase extends ApiControllerBase
                 Config::getInstance()->save();
                 $result = array(
                     "result" => "saved",
-                    "uuid" => str_replace($path . ".", "", $node->__reference)
+                    "uuid" => $node->getAttribute('uuid')
                 );
             } else {
                 $result["result"] = "failed";
diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
index b637b8286..0783930ad 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
@@ -379,6 +379,20 @@ abstract class BaseField
         return $this->internalAttributes;
     }
 
+    /**
+     * get attribute by name
+     * @param string $key attribute key
+     * @return null|string value
+     */
+    public function getAttribute($key)
+    {
+        if (isset($this->internalAttributes[$key])) {
+            return $this->internalAttributes[$key];
+        } else {
+            return null;
+        }
+    }
+
     /**
      * get this nodes children
      * @return array child items