diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to [Package Versioning Policy](https://wiki.haskell.org/Package_versioning_policy).
+## [2.0.8] - 2015-10-03
+
+### Fixed
+- next function was getting only one batch when the request was unlimited,
+  as a result you were receiving only 101 docs (default mongo batch size)
 
 ## [2.0.7] - 2015-09-04
 
diff --git a/Database/MongoDB/Query.hs b/Database/MongoDB/Query.hs
--- a/Database/MongoDB/Query.hs
+++ b/Database/MongoDB/Query.hs
@@ -49,7 +49,7 @@
 import Control.Exception (Exception, throwIO)
 import Control.Monad (unless, replicateM, liftM)
 import Data.Int (Int32)
-import Data.Maybe (listToMaybe, catMaybes)
+import Data.Maybe (listToMaybe, catMaybes, isNothing)
 import Data.Word (Word32)
 #if !MIN_VERSION_base(4,8,0)
 import Data.Monoid (mappend)
@@ -628,7 +628,7 @@
                     let newLimit = do
                               limit <- mLimit
                               return $ limit - 1
-                    dBatch' <- if null docs' && cid /= 0 && (newLimit > (Just 0))
+                    dBatch' <- if null docs' && cid /= 0 && ((newLimit > (Just 0)) || (isNothing newLimit))
                         then nextBatch' fcol batchSize newLimit cid
                         else return $ return (Batch newLimit cid docs')
                     when (newLimit == (Just 0)) $ unless (cid == 0) $ send [KillCursors [cid]]
diff --git a/mongoDB.cabal b/mongoDB.cabal
--- a/mongoDB.cabal
+++ b/mongoDB.cabal
@@ -1,5 +1,5 @@
 Name:           mongoDB
-Version:        2.0.7
+Version:        2.0.8
 Synopsis:       Driver (client) for MongoDB, a free, scalable, fast, document
                 DBMS
 Description:    This package lets you connect to MongoDB servers and