diff --git a/code/SQLite3Database.php b/code/SQLite3Database.php
index e800ad6..1a4bb8c 100644
--- a/code/SQLite3Database.php
+++ b/code/SQLite3Database.php
@@ -935,10 +935,18 @@ class SQLite3Database extends SS_Database {
 			$objects[] = new $record['ClassName']($record);
 
 		if(isset($objects)) $doSet = new DataObjectSet($objects);
-			else $doSet = new DataObjectSet();
+		else $doSet = new DataObjectSet();
 
-		$doSet->setPageLimits($start, $pageLength, $totalCount);
-		return $doSet;
+		if(class_exists('PaginatedList')) {
+			$list = new PaginatedList($doSet);
+			$list->setPageStart($start);
+			$list->setPageLEngth($pageLength);
+			$list->setTotalItems($totalCount);
+			return $list;
+		} else {
+			$doSet->setPageLimits($start, $pageLength, $totalCount);
+			return $doSet;
+		}
 	}
 
 	/*