diff --git a/src/CustomerFieldsFetcherHelper.php b/src/CustomerFieldsFetcherHelper.php
index 7c6fa01..46469a2 100644
--- a/src/CustomerFieldsFetcherHelper.php
+++ b/src/CustomerFieldsFetcherHelper.php
@@ -28,17 +28,19 @@ protected static function fetch(): array
 
             $response = $client->query("
                 query {
-                    customerFieldsFetcher(filters: {include: { archived: false }}) {
-                        fields {
-                            name
-                            label
-                            __typename
-                        }
+                  fields {
+                    customerFieldsFetcher(filters: { include: { archived: false } }) {
+                      fields {
+                        name
+                        label
+                        __typename
+                      }
                     }
+                  }
                 }
             ", []);
 
-            self::$data = $response->getData()['customerFieldsFetcher']['fields'];
+            self::$data = $response->getData()['fields']['customerFieldsFetcher']['fields'];
         }
 
         return self::$data;
diff --git a/src/OrderFieldsFetcherHelper.php b/src/OrderFieldsFetcherHelper.php
index f91fc10..665f587 100644
--- a/src/OrderFieldsFetcherHelper.php
+++ b/src/OrderFieldsFetcherHelper.php
@@ -28,17 +28,19 @@ protected static function fetch(): array
 
             $response = $client->query("
                 query {
-                    orderFieldsFetcher(filters: {include: { archived: false }}) {
-                        fields {
-                            name
-                            label
-                            __typename
-                        }
+                  fields {
+                    orderFieldsFetcher(filters: { include: { archived: false } }) {
+                      fields {
+                        name
+                        label
+                        __typename
+                      }
                     }
+                  }
                 }
             ", []);
 
-            self::$data = $response->getData()['orderFieldsFetcher']['fields'];
+            self::$data = $response->getData()['fields']['orderFieldsFetcher']['fields'];
         }
 
         return self::$data;