diff --git a/class.databaserecord.php b/class.databaserecord.php
index a8139c5..c954061 100644
--- a/class.databaserecord.php
+++ b/class.databaserecord.php
@@ -619,10 +619,14 @@ abstract class CPHPDatabaseRecordClass extends CPHPBaseClass
 		
 		if($result)
 		{
-			if(count($result->data) == 1 || $first_only === true)
+			if($first_only === true)
 			{
 				return new static($result);
 			}
+			elseif(count($result->data) == 1)
+			{
+				return array(new static($result));
+			}
 			else
 			{
 				$result_array = array();