Spameri
diff --git a/‎src/Mapping/Settings/Mapping.php‎
Lines changed: 7 additions & 3 deletions b/‎src/Mapping/Settings/Mapping.php‎
Lines changed: 7 additions & 3 deletions
diff --git a/‎src/Mapping/Settings/Mapping/FieldObject.php‎
Lines changed: 9 additions & 0 deletions b/‎src/Mapping/Settings/Mapping/FieldObject.php‎
Lines changed: 9 additions & 0 deletions
@@ -74,10 +74,14 @@ public function toArray(): array
 		foreach ($this->fields as $field) {
 			if ($field instanceof \Spameri\ElasticQuery\Mapping\Settings\Mapping\SubFields) {
 				$fields[$field->key()] = $field->toArray();
-
-			} else {
-				$fields[$field->key()] = $field->toArray()[$field->key()];
+				continue;
+			}
+			if ($field instanceof \Spameri\ElasticQuery\Mapping\Settings\Mapping\FieldObject) {
+				$fields[$field->key()] = $field->toArray();
+				continue;
 			}
+
+			$fields[$field->key()] = $field->toArray()[$field->key()];
 		}
 
 		return [
 
@@ -38,6 +38,15 @@ public function toArray(): array
 		$fields = [];
 		/** @var \Spameri\ElasticQuery\Mapping\Settings\Mapping\FieldInterface $field */
 		foreach ($this->fields as $field) {
+			if ($field instanceof \Spameri\ElasticQuery\Mapping\Settings\Mapping\FieldObject) {
+				$fields[$field->key()] = $field->toArray();
+				continue;
+			}
+			if ($field instanceof \Spameri\ElasticQuery\Mapping\Settings\Mapping\FieldCollection) {
+				$fields[$field->key()] = $field->toArray();
+				continue;
+			}
+
 			$fields[$field->key()] = $field->toArray()[$field->key()];
 		}