 
   followLazyLoad: ->
 
+    { limit } = @getOptions()
+
     @on 'LazyLoadThresholdReached', kd.utils.debounce 300, =>
 
       return @hideLazyLoader()  if @filterStates.busy
 
-      @filterStates.skip += @getOption 'limit'
+      @filterStates.skip += limit
 
       @fetch @filterStates.query, (items) =>
         @addListItems items
         @filterStates.page++
+
+        if items.length is limit
+          @calculateAndFetchMoreIfNeeded()
+
       , { skip : @filterStates.skip }
 
 

      callback items


  loadView: ->

    super

    @loadItems()


  showNoItemWidget: ->


  calculateAndFetchMoreIfNeeded: ->

    mainView   = @getView()
    listView   = @getListView()

    viewHeight = mainView.getHeight()
    listHeight = listView.getHeight()

    debug 'calculateAndFetchMoreIfNeeded', {
      listHeight, viewHeight, listView, mainView
    }

    return  if 0 in [ viewHeight, listHeight ]

    if listHeight <= viewHeight
      @lazyLoader.show()
