diff --git a/CHANGELOG.md b/CHANGELOG.md
index 506d1c57..8b3dfb20 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -70,7 +70,10 @@
     * Fixed 2FA regenerate for Flex Users
     * Added missing closing </li> in language loops
     * Fixed issue with nested `list` fields both utilizing the custom `key` functionality
-
+    * Fixed issue with `array` field nested in `list` that were losing their index order when the list reordered
+    * Fixed file form field failing resolution checks in certain circumstances
+    * Fixed issue with deleting files in config based YAML files
+    
 # v1.9.7
 ## 06/21/2019
 
diff --git a/classes/plugin/AdminBaseController.php b/classes/plugin/AdminBaseController.php
index f6f68920..35e44d32 100644
--- a/classes/plugin/AdminBaseController.php
+++ b/classes/plugin/AdminBaseController.php
@@ -907,11 +907,11 @@ class AdminBaseController
             $settings = (object)$blueprints->schema()->getProperty($field);
         } else {
             $page = null;
-            if ($type === 'user') {
-                $settings = (object)$this->admin->blueprints($blueprint)->schema()->getProperty($field);
+            if ($type === 'themes') {
+                $obj = $this->grav[$type]->get(Utils::substrToString($blueprint, '/')); //here
+                $settings = (object) $obj->blueprints()->schema()->getProperty($field);
             } else {
-                $obj = $this->grav[$type]->get(Utils::substrToString($blueprint, '/'));
-                $settings = (object)$obj->blueprints()->schema()->getProperty($field);
+                $settings = (object)$this->admin->blueprints($blueprint)->schema()->getProperty($field);
             }
         }