diff --git a/common.pri b/common.pri
index 6987c1e..a31bb50 100644
--- a/common.pri
+++ b/common.pri
@@ -127,7 +127,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 5
-LIMEREPORT_VERSION_RELEASE = 38
+LIMEREPORT_VERSION_RELEASE = 39
 
 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
 DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
diff --git a/limereport/lrdatadesignintf.cpp b/limereport/lrdatadesignintf.cpp
index eb4b564..aca04e3 100644
--- a/limereport/lrdatadesignintf.cpp
+++ b/limereport/lrdatadesignintf.cpp
@@ -190,8 +190,10 @@ ModelToDataSource::ModelToDataSource(QAbstractItemModel* model, bool owned)
 {
     Q_ASSERT(model);
     if (model){
-        while (model->canFetchMore(QModelIndex()))
+        while (model->canFetchMore(QModelIndex())){
             model->fetchMore(QModelIndex());
+            if (model->rowCount() <= 0) break;
+        }
         connect(model, SIGNAL(destroyed()), this, SLOT(slotModelDestroed()));
         connect(model, SIGNAL(modelReset()), this, SIGNAL(modelStateChanged()));
     }