diff --git a/data/source/Database.php b/data/source/Database.php
index 08e8e7961a..7d48379d2b 100644
--- a/data/source/Database.php
+++ b/data/source/Database.php
@@ -713,7 +713,7 @@ public function fields($fields, $context) {
 				case is_array($item):
 					$toMerge[$name] = $item;
 					continue;
-				case is_object($item):
+				case isset($item->scalar):
 					$toMerge[$name] = array($item->scalar);
 					continue;
 				case in_array($item, $modelNames):