diff --git a/dist/angular-vs-repeat.js b/dist/angular-vs-repeat.js
index 5ecc840..f952f35 100644
--- a/dist/angular-vs-repeat.js
+++ b/dist/angular-vs-repeat.js
@@ -153,12 +153,12 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i
     throw new Error('angular-vs-repeat: no ng-repeat directive on a child element');
   }
 
-  function printDeprecationWarning(message) {
-    console.warn("vs-repeat deprecation: ".concat(message));
+  function printDeprecationWarning($element, message) {
+    console.warn("vs-repeat deprecation: ".concat(message), $element[0]);
   }
 
-  function attrDeprecated(attrname) {
-    printDeprecationWarning("".concat(attrname, " attribute is deprecated. Pass the options object to vs-repeat attribute instead <link>."));
+  function attrDeprecated(attrname, $element) {
+    printDeprecationWarning($element, "".concat(attrname, " attribute is deprecated. Pass the options object to vs-repeat attribute instead https://github.com/kamilkp/angular-vs-repeat#options"));
   }
 
   var defaultOptions = {
@@ -191,7 +191,7 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i
 
         ['vsSize', 'vsScrollParent', 'vsSizeProperty', 'vsHorizontal', 'vsOffsetBefore', 'vsOffsetAfter', 'vsScrolledToEndOffset', 'vsScrolledToBeginningOffset', 'vsExcess', 'vsScrollMargin'].forEach(function (attrname) {
           if (attrname in compileAttrs) {
-            attrDeprecated(attrname);
+            attrDeprecated(attrname, compileElement);
           }
         });
 
@@ -381,7 +381,7 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i
                       autosizingRequired = false;
 
                       if ($scope.$root && !$scope.$root.$$phase) {
-                        $scope.$apply();
+                        $scope.$digest();
                       }
                     }
                   } else {
@@ -416,11 +416,6 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i
             function scrollHandler() {
               if (updateInnerCollection()) {
                 $scope.$digest();
-                var expectedSize = $scope.vsRepeat.sizesCumulative[originalLength];
-
-                if (expectedSize !== repeatContainer[0][scrollSize]) {
-                  console.warn('vsRepeat: size mismatch. Expected size ' + expectedSize + 'px whereas actual size is ' + repeatContainer[0][scrollSize] + 'px. Fix vsSize on element:', $element[0]);
-                }
               }
             }
 
@@ -432,7 +427,7 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i
                 getFromMeasured();
 
                 if ($scope.$root && !$scope.$root.$$phase) {
-                  $scope.$apply();
+                  $scope.$digest();
                 }
               }
 
@@ -455,24 +450,30 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i
             var _prevStartIndex, _prevEndIndex, _minStartIndex, _maxEndIndex;
 
             $scope.$on('vsRenderAll', function () {
-              //e , quantum) {
-              if (options.latch) {
-                setTimeout(function () {
-                  // var __endIndex = Math.min($scope.vsRepeat.endIndex + (quantum || 1), originalLength);
-                  var __endIndex = originalLength;
-                  _maxEndIndex = Math.max(__endIndex, _maxEndIndex);
-                  $scope.vsRepeat.endIndex = options.latch ? _maxEndIndex : __endIndex;
-                  $scope[collectionName] = originalCollection.slice($scope.vsRepeat.startIndex, $scope.vsRepeat.endIndex);
-                  _prevEndIndex = $scope.vsRepeat.endIndex;
-                  $scope.$$postDigest(function () {
-                    $beforeContent.css(getLayoutProp(), 0);
-                    $afterContent.css(getLayoutProp(), 0);
-                  });
-                  $scope.$apply(function () {
-                    $scope.$emit('vsRenderAllDone');
-                  });
-                });
+              if (!options.latch) {
+                return;
+              }
+
+              if ($scope.vsRepeat.endIndex === originalLength) {
+                $scope.$emit('vsRenderAllDone');
+                return;
               }
+
+              setTimeout(function () {
+                // var __endIndex = Math.min($scope.vsRepeat.endIndex + (quantum || 1), originalLength);
+                var __endIndex = originalLength;
+                _maxEndIndex = Math.max(__endIndex, _maxEndIndex);
+                $scope.vsRepeat.endIndex = options.latch ? _maxEndIndex : __endIndex;
+                $scope[collectionName] = originalCollection.slice($scope.vsRepeat.startIndex, $scope.vsRepeat.endIndex);
+                _prevEndIndex = $scope.vsRepeat.endIndex;
+                $beforeContent.css(getLayoutProp(), 0);
+                $afterContent.css(getLayoutProp(), 0);
+                $scope.$emit('vsRenderAllDone');
+
+                if ($scope.$root && !$scope.$root.$$phase) {
+                  $scope.$digest();
+                }
+              });
             });
 
             function reinitialize() {
@@ -498,7 +499,7 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i
                 reinitialize();
 
                 if ($scope.$root && !$scope.$root.$$phase) {
-                  $scope.$apply();
+                  $scope.$digest();
                 }
               }
 
@@ -555,6 +556,8 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i
                 __startIndex = 0;
                 __endIndex = 1;
               } else {
+                _warnMismatch();
+
                 var relativeScroll = $scrollPosition - options.offsetBefore - scrollOffset;
 
                 var _binaryFind = binaryFind($scope.vsRepeat.sizesCumulative, relativeScroll - options.scrollMargin);
@@ -631,6 +634,23 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i
 
               return digestRequired;
             }
+
+            function _warnMismatch() {
+              $scope.$$postDigest(function () {
+                window.requestAnimationFrame(function () {
+                  var expectedSize = $scope.vsRepeat.sizesCumulative[originalLength];
+                  var compStyle = window.getComputedStyle(repeatContainer[0]);
+                  var paddings = options.horizontal ? ['paddingLeft', 'paddingRight'] : ['paddingTop', 'paddingBottom'];
+                  var containerSize = repeatContainer[0][scrollSize] - paddings.reduce(function (acc, prop) {
+                    return acc + Number(compStyle[prop].slice(0, -2));
+                  }, 0);
+
+                  if (repeatContainer[0][scrollSize] && expectedSize !== containerSize) {
+                    console.warn('vsRepeat: size mismatch. Expected size ' + expectedSize + 'px whereas actual size is ' + containerSize + 'px. Fix vsSize on element:', $element[0]);
+                  }
+                });
+              });
+            }
           }
         };
       }
diff --git a/dist/angular-vs-repeat.min.js b/dist/angular-vs-repeat.min.js
index c7c6536..b003a97 100644
--- a/dist/angular-vs-repeat.min.js
+++ b/dist/angular-vs-repeat.min.js
@@ -1 +1 @@
-function _toConsumableArray(e){if(Array.isArray(e)){for(var t=0,n=new Array(e.length);t<e.length;t++)n[t]=e[t];return n}return Array.from(e)}function _extends(){return(_extends=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}function _defineProperty(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function _sliceIterator(e,t){var n=[],r=!0,a=!1,o=void 0;try{for(var s,i=e[Symbol.iterator]();!(r=(s=i.next()).done)&&(n.push(s.value),!t||n.length!==t);r=!0);}catch(e){a=!0,o=e}finally{try{r||null==i.return||i.return()}finally{if(a)throw o}}return n}function _slicedToArray(e,t){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return _sliceIterator(e,t);throw new TypeError("Invalid attempt to destructure non-iterable instance")}!function(Y,U){var X=U.element.prototype.closest;if(!X){var r=["matches","matchesSelector","webkitMatches","webkitMatchesSelector","msMatches","msMatchesSelector","mozMatches","mozMatchesSelector"].reduce(function(e,t){var n;return null!==(n=e)&&void 0!==n?n:t in document.documentElement?t:null},null);X=function(e){for(var t,n=this[0].parentNode;n!==document.documentElement&&null!=n&&!n[r](e);)n=n.parentNode;return(null===(t=n)||void 0===t?void 0:t[r](e))?U.element(n):U.element()}}function G(){var e,t,n,r;return"pageYOffset"in Y?{scrollTop:Y.pageYOffset,scrollLeft:Y.pageXOffset}:{scrollTop:null!==(e=null!==(t=document.documentElement.scrollTop)&&void 0!==t?t:document.body.scrollTop)&&void 0!==e?e:0,scrollLeft:null!==(n=null!==(r=document.documentElement.scrollLeft)&&void 0!==r?r:document.body.scrollLeft)&&void 0!==n?n:0}}function K(e,t){return e===Y?"clientWidth"===t?Y.innerWidth:Y.innerHeight:e[t]}function d(e){var t;t="".concat(e," attribute is deprecated. Pass the options object to vs-repeat attribute instead <link>."),console.warn("vs-repeat deprecation: ".concat(t))}var Q={latch:!1,container:null,scrollParent:null,size:null,offsetBefore:0,offsetAfter:0,scrolledToBeginning:U.noop,scrolledToEnd:U.noop,scrolledToBeginningOffset:0,scrolledToEndOffset:0,scrollMargin:0,horizontal:!1,autoresize:!1,hunked:!1,hunkSize:0},e=U.module("vs-repeat",[]).directive("vsRepeat",["$compile","$parse",function(F,J){return{restrict:"A",scope:!0,compile:function(e,t){var n="vsRepeatContainer"in t?U.element(e[0].querySelector(t.vsRepeatContainer)):e,r=n.children(),a=r.eq(0),H=a[0].outerHTML,L="$vs_collection";["vsSize","vsScrollParent","vsSizeProperty","vsHorizontal","vsOffsetBefore","vsOffsetAfter","vsScrolledToEndOffset","vsScrolledToBeginningOffset","vsExcess","vsScrollMargin"].forEach(function(e){e in t&&d(e)});var o=_slicedToArray(function(e){for(var t=["ng-repeat","data-ng-repeat","ng-repeat-start","data-ng-repeat-start"],n=0;n<t.length;n++){var r=t[n];if(e.attr(r))return[r,e.attr(r),0<=r.indexOf("-start")]}throw new Error("angular-vs-repeat: no ng-repeat directive on a child element")}(a),3),q=o[0],s=o[1],W=o[2],i=_slicedToArray(/^\s*(\S+)\s+in\s+([\S\s]+?)(track\s+by\s+\S+)?$/.exec(s),4),j=i[1],N=i[2],D=i[3];if(W)for(var l=0,c=r.eq(l);null==c.attr("ng-repeat-end")&&null==c.attr("data-ng-repeat-end");)l++,c=r.eq(l),H+=c[0].outerHTML;return n.empty(),{pre:function(m,t,e){var n;function r(e){if("number"==typeof e.size)e.getSize=function(){return e.size};else{var t=J(String(e.size));e.getSize=function(e){return t(m,_defineProperty({},j,e))}}}m.vsRepeat={options:_extends({},Q,null!==(n=m.$eval(e.vsRepeat))&&void 0!==n?n:{})};var g=m.vsRepeat.options;r(g);var R,x=U.isDefined(e.vsRepeatContainer)?U.element(t[0].querySelector(e.vsRepeatContainer)):t,a=U.element(H),o=a[0].tagName.toLowerCase(),y=[],z=U.element("<"+o+' class="vs-repeat-before-content"></'+o+">"),$=U.element("<"+o+' class="vs-repeat-after-content"></'+o+">"),b=null===g.size,I=g.scrollParent?"window"===g.scrollParent?U.element(Y):X.call(x,g.scrollParent):x,w=g.horizontal?"clientWidth":"clientHeight",s=g.horizontal?"offsetWidth":"offsetHeight",i=g.horizontal?"scrollWidth":"scrollHeight",S=g.horizontal?"scrollLeft":"scrollTop";if((m.vsRepeat.totalSize=0)===I.length)throw"Specified scroll parent selector did not match any element";if(m.vsRepeat.$scrollParent=I,m.vsRepeat.sizesCumulative=[],g.debug){var l="window"===g.scrollParent?U.element(document.body):I,c=U.element('<div class="vs-repeat-debug-element"></div>');c.css("position","window"===g.scrollParent?"fixed":"absolute"),l.append(c),m.$on("$destroy",function(){c.remove()})}var T,C,O,A,d,u=K(I[0],w)||50;function p(){!y||y.length<1?(m[L]=[],R=0,m.vsRepeat.sizesCumulative=[0]):(R=y.length,g.size?v():f()),E()}function v(){var n=0<arguments.length&&void 0!==arguments[0]?arguments[0]:null,e=y.map(function(e){var t;return null!==(t=n)&&void 0!==t?t:g.getSize(e)}),t=0;m.vsRepeat.sizesCumulative=[0].concat(_toConsumableArray(e.map(function(e){return t+=e})))}function f(){b?m.$$postDigest(function(){if(x[0].offsetHeight||x[0].offsetWidth){for(var e=x.children(),t=0,n=!1,r=!1;t<e.length;){if(null!=e[t].attributes[q]||r){if(n||(u=0),n=!0,e[t][s]&&(u+=e[t][s]),!W)break;if(null!=e[t].attributes["ng-repeat-end"]||null!=e[t].attributes["data-ng-repeat-end"])break;r=!0}t++}n&&(v(u),E(),b=!1,m.$root&&!m.$root.$$phase&&m.$apply())}else var a=m.$watch(function(){(x[0].offsetHeight||x[0].offsetWidth)&&(a(),f())})}):v(u)}function M(){var e="tr"===o?"":"min-";return g.horizontal?e+"width":e+"height"}function h(){if(k()){m.$digest();var e=m.vsRepeat.sizesCumulative[R];e!==x[0][i]&&console.warn("vsRepeat: size mismatch. Expected size "+e+"px whereas actual size is "+x[0][i]+"px. Fix vsSize on element:",t[0])}}function _(){g.autoresize&&(b=!0,f(),m.$root&&!m.$root.$$phase&&m.$apply()),k()&&m.$digest()}function E(){var e;C=T=void 0,O=R,A=0,e=m.vsRepeat.sizesCumulative[R],m.vsRepeat.totalSize=g.offsetBefore+e+g.offsetAfter,k(),m.$emit("vsRepeatReinitialized",m.vsRepeat.startIndex,m.vsRepeat.endIndex)}function B(){var e=K(I[0],w);e!==d&&(E(),m.$root&&!m.$root.$$phase&&m.$apply()),d=e}function P(e,t){var n=2<arguments.length&&void 0!==arguments[2]?arguments[2]:0,r=3<arguments.length&&void 0!==arguments[3]?arguments[3]:e.length-1,a=4<arguments.length&&void 0!==arguments[4]?arguments[4]:1;if(e[n]===t)return[n,n,a];if(e[r]===t)return[r,r,a];if(1<r-n){var o=Math.floor((n+r)/2);return e[o]>t?P(e,t,n,o,a+1):P(e,t,o,r,a+1)}return[t>e[r]?r:n,t<e[n]?n:r,a]}function k(){var e,t,n=(e=I[0],t=S,e===Y?G()[t]:e[t]),r=K(I[0],w);g.debug&&(r/=2);var a,o,s,i=x[0]===I[0]?0:(a=x[0],o=I[0],s=g.horizontal,a.getBoundingClientRect()[s?"left":"top"]-(o===Y?0:o.getBoundingClientRect()[s?"left":"top"])+(o===Y?G():o)[s?"scrollLeft":"scrollTop"]),l=m.vsRepeat.startIndex,c=m.vsRepeat.endIndex;if(b&&!g.size)l=0,c=1;else{var d=n-g.offsetBefore-i;l=_slicedToArray(P(m.vsRepeat.sizesCumulative,d-g.scrollMargin),1)[0],l=Math.max(l,0),c=_slicedToArray(P(m.vsRepeat.sizesCumulative,d+g.scrollMargin+r,l),2)[1],c=Math.min(c,R)}O=Math.min(l,O),A=Math.max(c,A),m.vsRepeat.startIndex=g.latch?O:l,m.vsRepeat.endIndex=g.latch?A:c,A<m.vsRepeat.startIndex&&(m.vsRepeat.startIndex=A);var u=!1;if(null==T?u=!0:null==C&&(u=!0),u||(g.hunked?Math.abs(m.vsRepeat.startIndex-T)>=g.hunkSize||0===m.vsRepeat.startIndex&&0!==T?u=!0:(Math.abs(m.vsRepeat.endIndex-C)>=g.hunkSize||m.vsRepeat.endIndex===R&&C!==R)&&(u=!0):u=m.vsRepeat.startIndex!==T||m.vsRepeat.endIndex!==C),u){var p;m[L]=y.slice(m.vsRepeat.startIndex,m.vsRepeat.endIndex),m.$emit("vsRepeatInnerCollectionUpdated",m.vsRepeat.startIndex,m.vsRepeat.endIndex,T,C),g.scrolledToEnd&&(p=y.length-g.scrolledToEndOffset,(m.vsRepeat.endIndex>=p&&C<p||y.length&&m.vsRepeat.endIndex===y.length)&&m.$eval(g.scrolledToEnd)),g.scrolledToBeginning&&(p=g.scrolledToBeginningOffset,m.vsRepeat.startIndex<=p&&T>m.vsRepeat.startIndex&&m.$eval(g.scrolledToBeginning)),T=m.vsRepeat.startIndex,C=m.vsRepeat.endIndex;var v=m.vsRepeat.sizesCumulative[m.vsRepeat.startIndex]+g.offsetBefore,f=m.vsRepeat.sizesCumulative[m.vsRepeat.startIndex+m[L].length]+g.offsetBefore,h=m.vsRepeat.totalSize;z.css(M(),v+"px"),$.css(M(),h-f+"px")}return u}g.horizontal?(z.css("height","100%"),$.css("height","100%")):(z.css("width","100%"),$.css("width","100%")),e.vsRepeatOptions&&m.$watchCollection(e.vsRepeatOptions,function(e){var t=_extends({},g,e);JSON.stringify(t)!==JSON.stringify(g)&&(Object.assign(g,e),r(g),E())}),m.$watchCollection(N,function(){var e=0<arguments.length&&void 0!==arguments[0]?arguments[0]:[];y=e,p()}),a.eq(0).attr(q,j+" in "+L+(D?" "+D:"")),a.addClass("vs-repeat-repeated-element"),x.append(z),x.append(a),F(a)(m),x.append($),m.vsRepeat.startIndex=0,m.vsRepeat.endIndex=0,I.on("scroll",h),U.element(Y).on("resize",_),m.$on("$destroy",function(){U.element(Y).off("resize",_),I.off("scroll",h)}),m.$on("vsRepeatTrigger",p),m.$on("vsRepeatResize",function(){b=!0,f()}),m.$on("vsRenderAll",function(){g.latch&&setTimeout(function(){var e=R;A=Math.max(e,A),m.vsRepeat.endIndex=g.latch?A:e,m[L]=y.slice(m.vsRepeat.startIndex,m.vsRepeat.endIndex),C=m.vsRepeat.endIndex,m.$$postDigest(function(){z.css(M(),0),$.css(M(),0)}),m.$apply(function(){m.$emit("vsRenderAllDone")})})}),m.$watch(function(){"function"==typeof Y.requestAnimationFrame?Y.requestAnimationFrame(B):B()})}}}}}]);U.element(document.head).append('<style id="angular-vs-repeat-style">\n\t  \t.vs-repeat-debug-element {\n        top: 50%;\n        left: 0;\n        right: 0;\n        height: 1px;\n        background: red;\n        z-index: 99999999;\n        box-shadow: 0 0 20px red;\n      }\n\n      .vs-repeat-debug-element + .vs-repeat-debug-element {\n        display: none;\n      }\n    </style>'),"undefined"!=typeof module&&module.exports&&(module.exports=e.name)}(window,window.angular);
\ No newline at end of file
+function _toConsumableArray(e){if(Array.isArray(e)){for(var t=0,n=new Array(e.length);t<e.length;t++)n[t]=e[t];return n}return Array.from(e)}function _extends(){return(_extends=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}function _defineProperty(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function _sliceIterator(e,t){var n=[],r=!0,o=!1,a=void 0;try{for(var s,i=e[Symbol.iterator]();!(r=(s=i.next()).done)&&(n.push(s.value),!t||n.length!==t);r=!0);}catch(e){o=!0,a=e}finally{try{r||null==i.return||i.return()}finally{if(o)throw a}}return n}function _slicedToArray(e,t){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return _sliceIterator(e,t);throw new TypeError("Invalid attempt to destructure non-iterable instance")}!function(Y,U){var X=U.element.prototype.closest;if(!X){var r=["matches","matchesSelector","webkitMatches","webkitMatchesSelector","msMatches","msMatchesSelector","mozMatches","mozMatchesSelector"].reduce(function(e,t){var n;return null!==(n=e)&&void 0!==n?n:t in document.documentElement?t:null},null);X=function(e){for(var t,n=this[0].parentNode;n!==document.documentElement&&null!=n&&!n[r](e);)n=n.parentNode;return(null===(t=n)||void 0===t?void 0:t[r](e))?U.element(n):U.element()}}function G(){var e,t,n,r;return"pageYOffset"in Y?{scrollTop:Y.pageYOffset,scrollLeft:Y.pageXOffset}:{scrollTop:null!==(e=null!==(t=document.documentElement.scrollTop)&&void 0!==t?t:document.body.scrollTop)&&void 0!==e?e:0,scrollLeft:null!==(n=null!==(r=document.documentElement.scrollLeft)&&void 0!==r?r:document.body.scrollLeft)&&void 0!==n?n:0}}function K(e,t){return e===Y?"clientWidth"===t?Y.innerWidth:Y.innerHeight:e[t]}function c(e,t){var n,r;n=t,r="".concat(e," attribute is deprecated. Pass the options object to vs-repeat attribute instead https://github.com/kamilkp/angular-vs-repeat#options"),console.warn("vs-repeat deprecation: ".concat(r),n[0])}var Q={latch:!1,container:null,scrollParent:null,size:null,offsetBefore:0,offsetAfter:0,scrolledToBeginning:U.noop,scrolledToEnd:U.noop,scrolledToBeginningOffset:0,scrolledToEndOffset:0,scrollMargin:0,horizontal:!1,autoresize:!1,hunked:!1,hunkSize:0},e=U.module("vs-repeat",[]).directive("vsRepeat",["$compile","$parse",function(F,J){return{restrict:"A",scope:!0,compile:function(t,n){var e="vsRepeatContainer"in n?U.element(t[0].querySelector(n.vsRepeatContainer)):t,r=e.children(),o=r.eq(0),L=o[0].outerHTML,q="$vs_collection";["vsSize","vsScrollParent","vsSizeProperty","vsHorizontal","vsOffsetBefore","vsOffsetAfter","vsScrolledToEndOffset","vsScrolledToBeginningOffset","vsExcess","vsScrollMargin"].forEach(function(e){e in n&&c(e,t)});var a=_slicedToArray(function(e){for(var t=["ng-repeat","data-ng-repeat","ng-repeat-start","data-ng-repeat-start"],n=0;n<t.length;n++){var r=t[n];if(e.attr(r))return[r,e.attr(r),0<=r.indexOf("-start")]}throw new Error("angular-vs-repeat: no ng-repeat directive on a child element")}(o),3),H=a[0],s=a[1],W=a[2],i=_slicedToArray(/^\s*(\S+)\s+in\s+([\S\s]+?)(track\s+by\s+\S+)?$/.exec(s),4),j=i[1],N=i[2],D=i[3];if(W)for(var l=0,d=r.eq(l);null==d.attr("ng-repeat-end")&&null==d.attr("data-ng-repeat-end");)l++,d=r.eq(l),L+=d[0].outerHTML;return e.empty(),{pre:function(g,m,e){var t;function n(e){if("number"==typeof e.size)e.getSize=function(){return e.size};else{var t=J(String(e.size));e.getSize=function(e){return t(g,_defineProperty({},j,e))}}}g.vsRepeat={options:_extends({},Q,null!==(t=g.$eval(e.vsRepeat))&&void 0!==t?t:{})};var R=g.vsRepeat.options;n(R);var x,z=U.isDefined(e.vsRepeatContainer)?U.element(m[0].querySelector(e.vsRepeatContainer)):m,r=U.element(L),o=r[0].tagName.toLowerCase(),$=[],y=U.element("<"+o+' class="vs-repeat-before-content"></'+o+">"),b=U.element("<"+o+' class="vs-repeat-after-content"></'+o+">"),I=null===R.size,w=R.scrollParent?"window"===R.scrollParent?U.element(Y):X.call(z,R.scrollParent):z,S=R.horizontal?"clientWidth":"clientHeight",a=R.horizontal?"offsetWidth":"offsetHeight",T=R.horizontal?"scrollWidth":"scrollHeight",A=R.horizontal?"scrollLeft":"scrollTop";if((g.vsRepeat.totalSize=0)===w.length)throw"Specified scroll parent selector did not match any element";if(g.vsRepeat.$scrollParent=w,g.vsRepeat.sizesCumulative=[],R.debug){var s="window"===R.scrollParent?U.element(document.body):w,i=U.element('<div class="vs-repeat-debug-element"></div>');i.css("position","window"===R.scrollParent?"fixed":"absolute"),s.append(i),g.$on("$destroy",function(){i.remove()})}var C,O,M,_,l,d=K(w[0],S)||50;function c(){!$||$.length<1?(g[q]=[],x=0,g.vsRepeat.sizesCumulative=[0]):(x=$.length,R.size?u():p()),h()}function u(){var n=0<arguments.length&&void 0!==arguments[0]?arguments[0]:null,e=$.map(function(e){var t;return null!==(t=n)&&void 0!==t?t:R.getSize(e)}),t=0;g.vsRepeat.sizesCumulative=[0].concat(_toConsumableArray(e.map(function(e){return t+=e})))}function p(){I?g.$$postDigest(function(){if(z[0].offsetHeight||z[0].offsetWidth){for(var e=z.children(),t=0,n=!1,r=!1;t<e.length;){if(null!=e[t].attributes[H]||r){if(n||(d=0),n=!0,e[t][a]&&(d+=e[t][a]),!W)break;if(null!=e[t].attributes["ng-repeat-end"]||null!=e[t].attributes["data-ng-repeat-end"])break;r=!0}t++}n&&(u(d),h(),I=!1,g.$root&&!g.$root.$$phase&&g.$digest())}else var o=g.$watch(function(){(z[0].offsetHeight||z[0].offsetWidth)&&(o(),p())})}):u(d)}function B(){var e="tr"===o?"":"min-";return R.horizontal?e+"width":e+"height"}function v(){k()&&g.$digest()}function f(){R.autoresize&&(I=!0,p(),g.$root&&!g.$root.$$phase&&g.$digest()),k()&&g.$digest()}function h(){var e;O=C=void 0,M=x,_=0,e=g.vsRepeat.sizesCumulative[x],g.vsRepeat.totalSize=R.offsetBefore+e+R.offsetAfter,k(),g.$emit("vsRepeatReinitialized",g.vsRepeat.startIndex,g.vsRepeat.endIndex)}function E(){var e=K(w[0],S);e!==l&&(h(),g.$root&&!g.$root.$$phase&&g.$digest()),l=e}function P(e,t){var n=2<arguments.length&&void 0!==arguments[2]?arguments[2]:0,r=3<arguments.length&&void 0!==arguments[3]?arguments[3]:e.length-1,o=4<arguments.length&&void 0!==arguments[4]?arguments[4]:1;if(e[n]===t)return[n,n,o];if(e[r]===t)return[r,r,o];if(1<r-n){var a=Math.floor((n+r)/2);return e[a]>t?P(e,t,n,a,o+1):P(e,t,a,r,o+1)}return[t>e[r]?r:n,t<e[n]?n:r,o]}function k(){var e,t,n=(e=w[0],t=A,e===Y?G()[t]:e[t]),r=K(w[0],S);R.debug&&(r/=2);var o,a,s,i=z[0]===w[0]?0:(o=z[0],a=w[0],s=R.horizontal,o.getBoundingClientRect()[s?"left":"top"]-(a===Y?0:a.getBoundingClientRect()[s?"left":"top"])+(a===Y?G():a)[s?"scrollLeft":"scrollTop"]),l=g.vsRepeat.startIndex,d=g.vsRepeat.endIndex;if(I&&!R.size)l=0,d=1;else{g.$$postDigest(function(){Y.requestAnimationFrame(function(){var e=g.vsRepeat.sizesCumulative[x],n=Y.getComputedStyle(z[0]),t=R.horizontal?["paddingLeft","paddingRight"]:["paddingTop","paddingBottom"],r=z[0][T]-t.reduce(function(e,t){return e+Number(n[t].slice(0,-2))},0);z[0][T]&&e!==r&&console.warn("vsRepeat: size mismatch. Expected size "+e+"px whereas actual size is "+r+"px. Fix vsSize on element:",m[0])})});var c=n-R.offsetBefore-i;l=_slicedToArray(P(g.vsRepeat.sizesCumulative,c-R.scrollMargin),1)[0],l=Math.max(l,0),d=_slicedToArray(P(g.vsRepeat.sizesCumulative,c+R.scrollMargin+r,l),2)[1],d=Math.min(d,x)}M=Math.min(l,M),_=Math.max(d,_),g.vsRepeat.startIndex=R.latch?M:l,g.vsRepeat.endIndex=R.latch?_:d,_<g.vsRepeat.startIndex&&(g.vsRepeat.startIndex=_);var u=!1;if(null==C?u=!0:null==O&&(u=!0),u||(R.hunked?Math.abs(g.vsRepeat.startIndex-C)>=R.hunkSize||0===g.vsRepeat.startIndex&&0!==C?u=!0:(Math.abs(g.vsRepeat.endIndex-O)>=R.hunkSize||g.vsRepeat.endIndex===x&&O!==x)&&(u=!0):u=g.vsRepeat.startIndex!==C||g.vsRepeat.endIndex!==O),u){var p;g[q]=$.slice(g.vsRepeat.startIndex,g.vsRepeat.endIndex),g.$emit("vsRepeatInnerCollectionUpdated",g.vsRepeat.startIndex,g.vsRepeat.endIndex,C,O),R.scrolledToEnd&&(p=$.length-R.scrolledToEndOffset,(g.vsRepeat.endIndex>=p&&O<p||$.length&&g.vsRepeat.endIndex===$.length)&&g.$eval(R.scrolledToEnd)),R.scrolledToBeginning&&(p=R.scrolledToBeginningOffset,g.vsRepeat.startIndex<=p&&C>g.vsRepeat.startIndex&&g.$eval(R.scrolledToBeginning)),C=g.vsRepeat.startIndex,O=g.vsRepeat.endIndex;var v=g.vsRepeat.sizesCumulative[g.vsRepeat.startIndex]+R.offsetBefore,f=g.vsRepeat.sizesCumulative[g.vsRepeat.startIndex+g[q].length]+R.offsetBefore,h=g.vsRepeat.totalSize;y.css(B(),v+"px"),b.css(B(),h-f+"px")}return u}R.horizontal?(y.css("height","100%"),b.css("height","100%")):(y.css("width","100%"),b.css("width","100%")),e.vsRepeatOptions&&g.$watchCollection(e.vsRepeatOptions,function(e){var t=_extends({},R,e);JSON.stringify(t)!==JSON.stringify(R)&&(Object.assign(R,e),n(R),h())}),g.$watchCollection(N,function(){var e=0<arguments.length&&void 0!==arguments[0]?arguments[0]:[];$=e,c()}),r.eq(0).attr(H,j+" in "+q+(D?" "+D:"")),r.addClass("vs-repeat-repeated-element"),z.append(y),z.append(r),F(r)(g),z.append(b),g.vsRepeat.startIndex=0,g.vsRepeat.endIndex=0,w.on("scroll",v),U.element(Y).on("resize",f),g.$on("$destroy",function(){U.element(Y).off("resize",f),w.off("scroll",v)}),g.$on("vsRepeatTrigger",c),g.$on("vsRepeatResize",function(){I=!0,p()}),g.$on("vsRenderAll",function(){R.latch&&(g.vsRepeat.endIndex!==x?setTimeout(function(){var e=x;_=Math.max(e,_),g.vsRepeat.endIndex=R.latch?_:e,g[q]=$.slice(g.vsRepeat.startIndex,g.vsRepeat.endIndex),O=g.vsRepeat.endIndex,y.css(B(),0),b.css(B(),0),g.$emit("vsRenderAllDone"),g.$root&&!g.$root.$$phase&&g.$digest()}):g.$emit("vsRenderAllDone"))}),g.$watch(function(){"function"==typeof Y.requestAnimationFrame?Y.requestAnimationFrame(E):E()})}}}}}]);U.element(document.head).append('<style id="angular-vs-repeat-style">\n\t  \t.vs-repeat-debug-element {\n        top: 50%;\n        left: 0;\n        right: 0;\n        height: 1px;\n        background: red;\n        z-index: 99999999;\n        box-shadow: 0 0 20px red;\n      }\n\n      .vs-repeat-debug-element + .vs-repeat-debug-element {\n        display: none;\n      }\n    </style>'),"undefined"!=typeof module&&module.exports&&(module.exports=e.name)}(window,window.angular);
\ No newline at end of file
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index fd37070..a77a33d 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -5,12 +5,7 @@ import rename from 'gulp-rename';
 import clean from 'gulp-clean';
 import { Server } from 'karma';
 
-gulp.task('clean', () =>
-  gulp.src('dist', { read: false })
-		.pipe(clean())
-);
-
-gulp.task('babel', ['clean'], () =>
+gulp.task('babel', () =>
   gulp.src('src/angular-vs-repeat.js')
 		.pipe(babel())
 		.pipe(gulp.dest('dist'))
@@ -40,6 +35,6 @@ gulp.task('karma-travis', ['build'], (done) => {
   }, done).start();
 });
 
-gulp.task('build', ['clean', 'babel', 'min']);
+gulp.task('build', ['babel', 'min']);
 gulp.task('test', ['build', 'karma']);
 gulp.task('travis', ['build', 'karma-travis']);
diff --git a/src/angular-vs-repeat.js b/src/angular-vs-repeat.js
index d8e0f0c..e4bfda1 100644
--- a/src/angular-vs-repeat.js
+++ b/src/angular-vs-repeat.js
@@ -377,7 +377,7 @@
                       reinitialize();
                       autosizingRequired = false;
                       if ($scope.$root && !$scope.$root.$$phase) {
-                        $scope.$apply();
+                        $scope.$digest();
                       }
                     }
                   } else {
@@ -424,7 +424,7 @@
                 autosizingRequired = true;
                 getFromMeasured();
                 if ($scope.$root && !$scope.$root.$$phase) {
-                  $scope.$apply();
+                  $scope.$digest();
                 }
               }
 
@@ -451,28 +451,34 @@
               _minStartIndex,
               _maxEndIndex;
 
-            $scope.$on('vsRenderAll', function() {//e , quantum) {
-              if (options.latch) {
-                setTimeout(() => {
-                  // var __endIndex = Math.min($scope.vsRepeat.endIndex + (quantum || 1), originalLength);
-                  const __endIndex = originalLength;
-                  _maxEndIndex = Math.max(__endIndex, _maxEndIndex);
+            $scope.$on('vsRenderAll', function() {
+              if (!options.latch) {
+                return;
+              }
 
-                  $scope.vsRepeat.endIndex = options.latch ? _maxEndIndex : __endIndex;
-                  $scope[collectionName] = originalCollection.slice($scope.vsRepeat.startIndex, $scope.vsRepeat.endIndex);
+              if ($scope.vsRepeat.endIndex === originalLength) {
+                $scope.$emit('vsRenderAllDone');
+                return;
+              }
 
-                  _prevEndIndex = $scope.vsRepeat.endIndex;
+              setTimeout(() => {
+                // var __endIndex = Math.min($scope.vsRepeat.endIndex + (quantum || 1), originalLength);
+                const __endIndex = originalLength;
+                _maxEndIndex = Math.max(__endIndex, _maxEndIndex);
 
-                  $scope.$$postDigest(() => {
-                    $beforeContent.css(getLayoutProp(), 0);
-                    $afterContent.css(getLayoutProp(), 0);
-                  });
+                $scope.vsRepeat.endIndex = options.latch ? _maxEndIndex : __endIndex;
+                $scope[collectionName] = originalCollection.slice($scope.vsRepeat.startIndex, $scope.vsRepeat.endIndex);
 
-                  $scope.$apply(() => {
-                    $scope.$emit('vsRenderAllDone');
-                  });
-                });
-              }
+                _prevEndIndex = $scope.vsRepeat.endIndex;
+
+                $beforeContent.css(getLayoutProp(), 0);
+                $afterContent.css(getLayoutProp(), 0);
+
+                $scope.$emit('vsRenderAllDone');
+                if ($scope.$root && !$scope.$root.$$phase) {
+                  $scope.$digest();
+                }
+              });
             });
 
             function reinitialize() {
@@ -496,7 +502,7 @@
               if (ch !== _prevClientSize) {
                 reinitialize();
                 if ($scope.$root && !$scope.$root.$$phase) {
-                  $scope.$apply();
+                  $scope.$digest();
                 }
               }
               _prevClientSize = ch;
diff --git a/test/spec.js b/test/spec.js
index 63b36bf..3a08bd7 100644
--- a/test/spec.js
+++ b/test/spec.js
@@ -185,7 +185,7 @@
     it('should support manually provided unique element size', function(done){
       $element = $compile([
         '<div vs-repeat="{size: 150}" class="container">',
-        '	<div ng-repeat="foo in bar" class="item">',
+        '	<div ng-repeat="foo in bar" class="item" ng-style="{height: \'150px\'}">',
         '		<span class="value">{{foo.value}}</span>',
         '	</div>',
         '</div>',
@@ -196,8 +196,7 @@
 
       setTimeout(() => {
         var elems = getElements($element);
-        expect(elems.length).to.be.greaterThan(1);
-        expect(elems.length).to.be.lessThan(5);
+        expect(elems.length).to.equal(2);
         done();
       });
     });
@@ -535,7 +534,7 @@
       done();
     });
 
-    it.only('should properly calculate start and end index with element beyond', function (done) {
+    it('should properly calculate start and end index with element beyond', function (done) {
       $element = angular.element(`
         <div class="container" style="height: 200px;">
           <div vs-repeat="{size: 20, scrollParent: '.container'}" style="margin: 300px 0">