diff --git a/src/Persistence/DbRepositoryBase.php b/src/Persistence/DbRepositoryBase.php
index <HASH>..<HASH> 100644
--- a/src/Persistence/DbRepositoryBase.php
+++ b/src/Persistence/DbRepositoryBase.php
@@ -145,14 +145,9 @@ abstract class DbRepositoryBase implements IObjectSetWithLoadCriteriaSupport
 
         $this->validateHasRequiredColumns($sql, reset($rows));
 
-        $table      = $this->mapper->getPrimaryTable();
-        $rowObjects = [];
+        $rowSet = $this->connection->getPlatform()->mapResultSetToPhpForm($this->mapper->getSelect()->getResultSetTableStructure(), $rows);
 
-        foreach ($rows as $row) {
-            $rowObjects[] = new Row($table, $row);
-        }
-
-        return $this->mapper->loadAll($this->loadingContext, $rowObjects);
+        return $this->mapper->loadAll($this->loadingContext, $rowSet->getRows());
     }
 
     protected function replaceQueryPlaceholders(string $sql)
Fix issue with loading objects from custom SQL query