diff --git a/DataStorage/Database/Mapper/ReadMapper.php b/DataStorage/Database/Mapper/ReadMapper.php
index b4d1ef13c..87daff495 100755
--- a/DataStorage/Database/Mapper/ReadMapper.php
+++ b/DataStorage/Database/Mapper/ReadMapper.php
@@ -461,7 +461,7 @@ final class ReadMapper extends DataMapperAbstract
             return 0;
         }
 
-        return \stripos($result, '.') ? (float) $result : (int) $result;
+        return \stripos($result, '.') === false ? (int) $result : (float) $result;
     }
 
     /**
diff --git a/tests/DataStorage/Database/DataMapperAbstractTest.php b/tests/DataStorage/Database/DataMapperAbstractTest.php
index 138767800..daed7cbbc 100755
--- a/tests/DataStorage/Database/DataMapperAbstractTest.php
+++ b/tests/DataStorage/Database/DataMapperAbstractTest.php
@@ -386,7 +386,7 @@ final class DataMapperAbstractTest extends \PHPUnit\Framework\TestCase
     public function testRandom() : void
     {
         $id = BaseModelMapper::create()->execute($this->model);
-        self::assertEquals($id, BaseModelMApper::getRandom()->execute()->id);
+        self::assertEquals($id, BaseModelMApper::getRandom()->limit(1)->execute()->id);
     }
 
     /**