diff --git a/.gitignore b/.gitignore
index f3215ee..24aac9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .DS_Store
 node_modules
-test/draft.js
\ No newline at end of file
+test/draft.js
+/.idea/
diff --git a/dist/angular-vs-repeat.js b/dist/angular-vs-repeat.js
index 3d9efb8..1d129dd 100644
--- a/dist/angular-vs-repeat.js
+++ b/dist/angular-vs-repeat.js
@@ -21,10 +21,10 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i
    * into a component, where the user thinks he has all the elements rendered and all he needs to do is scroll (without any kind of
    * pagination - which most users loath) and at the same time the browser isn't overloaded by that many elements/angular bindings etc.
    * The directive renders only so many elements that can fit into current container's clientHeight/clientWidth.
-    * LIMITATIONS:
+     * LIMITATIONS:
    * - current version only supports an Array as a right-hand-side object for ngRepeat
    * - all rendered elements must have the same height/width or the sizes of the elements must be known up front
-    * USAGE:
+     * USAGE:
    * In order to use the vsRepeat directive you need to place a vs-repeat attribute on a direct parent of an element with ng-repeat
    * example:
    * <div vs-repeat="options">
@@ -32,7 +32,7 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i
    *          <!-- content -->
    *      </div>
    * </div>
-    * or:
+     * or:
    * <div vs-repeat="options">
    *      <div ng-repeat-start="item in someArray">
    *          <!-- content -->
@@ -44,7 +44,7 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i
    *          <!-- content -->
    *      </div>
    * </div>
-    * You can also measure the single element's height/width (including all paddings and margins), and then speficy it as a value
+     * You can also measure the single element's height/width (including all paddings and margins), and then speficy it as a value
    * of the option's `size` property. This can be used if one wants to override the automatically computed element size.
    * example:
    * <div vs-repeat="{size: 50}"> <!-- the specified element height is 50px -->
@@ -52,13 +52,13 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i
    *          <!-- content -->
    *      </div>
    * </div>
-    * IMPORTANT!
-    * - the vsRepeat directive must be applied to a direct parent of an element with ngRepeat
+     * IMPORTANT!
+     * - the vsRepeat directive must be applied to a direct parent of an element with ngRepeat
    * - the value of vsRepeat attribute is the single element's height/width measured in pixels. If none provided, the directive
    *      will compute it automatically
-    * OPTIONAL PARAMETERS (attributes):
+     * OPTIONAL PARAMETERS (attributes):
    * vs-repeat-container="selector" - selector for element containing ng-repeat. (defaults to the current element)
-    * OPTIONS:
+     * OPTIONS:
    * Options shall be passed as an object to the `vs-repeat` attribute e.g.: `<div vs-repeat="{scrollParent: 'window', size: 20}"></div>`
    *
    * Available options:
@@ -67,14 +67,14 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i
    * `offset-after` - bottom/right offset in pixels (defaults to 0)
    * `scroll-margin` - how many pixels ahead should elements be rendered while scrolling
    * `latch` - if true, elements will be rendered gradually but won't be removed when scrolled away (defaults to false)
-    * `size` - a property name of the items in collection that is a number denoting the element size (in pixels)
+     * `size` - a property name of the items in collection that is a number denoting the element size (in pixels)
    * `autoresize` - use this attribute without vs-size and without specifying element's size. The automatically computed element style will
    *              readjust upon window resize if the size is dependable on the viewport size
    * `scrolled-to-end` - callback will be called when the last item of the list is rendered
    * `scrolled-to-end-offset` - set this number to trigger the scrolledToEnd callback n items before the last gets rendered
    * `scrolled-to-beginning` - callback will be called when the first item of the list is rendered
    * `scrolled-to-beginning-offset` - set this number to trigger the scrolledToBeginning callback n items before the first gets rendered
-    * EVENTS:
+     * EVENTS:
    * - `vsRepeatTrigger` - an event the directive listens for to manually trigger reinitialization
    * - `vsRepeatReinitialized` - an event the directive emits upon reinitialization done
    */
@@ -161,6 +161,14 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i
     printDeprecationWarning($element, "".concat(attrname, " attribute is deprecated. Pass the options object to vs-repeat attribute instead https://github.com/kamilkp/angular-vs-repeat#options"));
   }
 
+  function safeDigest(scope) {
+    var phase = scope.$root.$$phase;
+
+    if (phase !== "$apply" && phase !== "$digest") {
+      scope.$digest();
+    }
+  }
+
   var defaultOptions = {
     latch: false,
     preserveLatchOnRefresh: false,
@@ -381,8 +389,8 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i
                       reinitialize();
                       autosizingRequired = false;
 
-                      if ($scope.$root && !$scope.$root.$$phase) {
-                        $scope.$digest();
+                      if ($scope.$root) {
+                        safeDigest($scope);
                       }
                     }
                   } else {
@@ -419,7 +427,7 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i
               var pos = $scrollParent[0][scrollPos];
 
               if (updateInnerCollection()) {
-                $scope.$digest();
+                safeDigest($scope);
 
                 if (options._ensureScrollIntegrity) {
                   $scrollParent[0][scrollPos] = pos;
@@ -434,13 +442,13 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i
                 autosizingRequired = true;
                 getFromMeasured();
 
-                if ($scope.$root && !$scope.$root.$$phase) {
-                  $scope.$digest();
+                if ($scope.$root) {
+                  safeDigest($scope);
                 }
               }
 
               if (updateInnerCollection()) {
-                $scope.$digest();
+                safeDigest($scope);
               }
             }
 
@@ -478,8 +486,8 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i
                 $afterContent.css(getLayoutProps(0));
                 $scope.$emit('vsRenderAllDone');
 
-                if ($scope.$root && !$scope.$root.$$phase) {
-                  $scope.$digest();
+                if ($scope.$root) {
+                  safeDigest($scope);
                 }
               });
             });
@@ -510,8 +518,8 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i
               if (ch !== _prevClientSize) {
                 reinitialize();
 
-                if ($scope.$root && !$scope.$root.$$phase) {
-                  $scope.$digest();
+                if ($scope.$root) {
+                  safeDigest($scope);
                 }
               }
 
diff --git a/dist/angular-vs-repeat.min.js b/dist/angular-vs-repeat.min.js
index 0554921..ef59b78 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,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,preserveLatchOnRefresh:!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",O=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 A,C,M,_,l,d=K(w[0],S)||50;function c(){!y||y.length<1?(g[q]=[],x=0,g.vsRepeat.sizesCumulative=[0]):(x=y.length,R.size?u():p()),h()}function u(){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: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(n){var r=R.horizontal?"width":"height";return["","min-","max-"].reduce(function(e,t){return e["".concat(t).concat(r)]=n,e},{})}function v(){var e=w[0][O];k()&&(g.$digest(),R._ensureScrollIntegrity&&(w[0][O]=e))}function f(){R.autoresize&&(I=!0,p(),g.$root&&!g.$root.$$phase&&g.$digest()),k()&&g.$digest()}function h(){var e;C=A=void 0,R.preserveLatchOnRefresh&&void 0!==M&&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=O,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==A?u=!0:null==C&&(u=!0),u||(R.hunked?Math.abs(g.vsRepeat.startIndex-A)>=R.hunkSize||0===g.vsRepeat.startIndex&&0!==A?u=!0:(Math.abs(g.vsRepeat.endIndex-C)>=R.hunkSize||g.vsRepeat.endIndex===x&&C!==x)&&(u=!0):u=g.vsRepeat.startIndex!==A||g.vsRepeat.endIndex!==C),u){var p;g[q]=y.slice(g.vsRepeat.startIndex,g.vsRepeat.endIndex),g.$emit("vsRepeatInnerCollectionUpdated",g.vsRepeat.startIndex,g.vsRepeat.endIndex,A,C),R.scrolledToEnd&&(p=y.length-R.scrolledToEndOffset,(g.vsRepeat.endIndex>=p&&C<p||y.length&&g.vsRepeat.endIndex===y.length)&&g.$eval(R.scrolledToEnd)),R.scrolledToBeginning&&(p=R.scrolledToBeginningOffset,g.vsRepeat.startIndex<=p&&A>g.vsRepeat.startIndex&&g.$eval(R.scrolledToBeginning)),A=g.vsRepeat.startIndex,C=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;$.css(B(v+"px")),b.css(B(h-f+"px"))}return u}R.horizontal?($.css("height","100%"),b.css("height","100%")):($.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]:[];y=e,c()}),r.eq(0).attr(H,j+" in "+q+(D?" "+D:"")),r.addClass("vs-repeat-repeated-element"),z.append($),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]=y.slice(g.vsRepeat.startIndex,g.vsRepeat.endIndex),C=g.vsRepeat.endIndex,$.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\n      .vs-repeat-before-content,\n      .vs-repeat-after-content {\n        border: none !important;\n        padding: 0 !important;\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 d(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])}function Q(e){var t=e.$root.$$phase;"$apply"!==t&&"$digest"!==t&&e.$digest()}var V={latch:!1,preserveLatchOnRefresh:!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&&d(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,c=r.eq(l);null==c.attr("ng-repeat-end")&&null==c.attr("data-ng-repeat-end");)l++,c=r.eq(l),L+=c[0].outerHTML;return e.empty(),{pre:function(m,g,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(m,_defineProperty({},j,e))}}}m.vsRepeat={options:_extends({},V,null!==(t=m.$eval(e.vsRepeat))&&void 0!==t?t:{})};var R=m.vsRepeat.options;n(R);var x,y=U.isDefined(e.vsRepeatContainer)?U.element(g[0].querySelector(e.vsRepeatContainer)):g,r=U.element(L),o=r[0].tagName.toLowerCase(),z=[],b=U.element("<"+o+' class="vs-repeat-before-content"></'+o+">"),I=U.element("<"+o+' class="vs-repeat-after-content"></'+o+">"),$=null===R.size,w=R.scrollParent?"window"===R.scrollParent?U.element(Y):X.call(y,R.scrollParent):y,S=R.horizontal?"clientWidth":"clientHeight",a=R.horizontal?"offsetWidth":"offsetHeight",T=R.horizontal?"scrollWidth":"scrollHeight",O=R.horizontal?"scrollLeft":"scrollTop";if((m.vsRepeat.totalSize=0)===w.length)throw"Specified scroll parent selector did not match any element";if(m.vsRepeat.$scrollParent=w,m.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),m.$on("$destroy",function(){i.remove()})}var A,C,M,_,l,c=K(w[0],S)||50;function d(){!z||z.length<1?(m[q]=[],x=0,m.vsRepeat.sizesCumulative=[0]):(x=z.length,R.size?u():p()),h()}function u(){var n=0<arguments.length&&void 0!==arguments[0]?arguments[0]:null,e=z.map(function(e){var t;return null!==(t=n)&&void 0!==t?t:R.getSize(e)}),t=0;m.vsRepeat.sizesCumulative=[0].concat(_toConsumableArray(e.map(function(e){return t+=e})))}function p(){$?m.$$postDigest(function(){if(y[0].offsetHeight||y[0].offsetWidth){for(var e=y.children(),t=0,n=!1,r=!1;t<e.length;){if(null!=e[t].attributes[H]||r){if(n||(c=0),n=!0,e[t][a]&&(c+=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(c),h(),$=!1,m.$root&&Q(m))}else var o=m.$watch(function(){(y[0].offsetHeight||y[0].offsetWidth)&&(o(),p())})}):u(c)}function B(n){var r=R.horizontal?"width":"height";return["","min-","max-"].reduce(function(e,t){return e["".concat(t).concat(r)]=n,e},{})}function v(){var e=w[0][O];k()&&(Q(m),R._ensureScrollIntegrity&&(w[0][O]=e))}function f(){R.autoresize&&($=!0,p(),m.$root&&Q(m)),k()&&Q(m)}function h(){var e;C=A=void 0,R.preserveLatchOnRefresh&&void 0!==M&&void 0!==_||(M=x,_=0),e=m.vsRepeat.sizesCumulative[x],m.vsRepeat.totalSize=R.offsetBefore+e+R.offsetAfter,k(),m.$emit("vsRepeatReinitialized",m.vsRepeat.startIndex,m.vsRepeat.endIndex)}function E(){var e=K(w[0],S);e!==l&&(h(),m.$root&&Q(m)),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=O,e===Y?G()[t]:e[t]),r=K(w[0],S);R.debug&&(r/=2);var o,a,s,i=y[0]===w[0]?0:(o=y[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=m.vsRepeat.startIndex,c=m.vsRepeat.endIndex;if($&&!R.size)l=0,c=1;else{m.$$postDigest(function(){Y.requestAnimationFrame(function(){var e=m.vsRepeat.sizesCumulative[x],n=Y.getComputedStyle(y[0]),t=R.horizontal?["paddingLeft","paddingRight"]:["paddingTop","paddingBottom"],r=y[0][T]-t.reduce(function(e,t){return e+Number(n[t].slice(0,-2))},0);y[0][T]&&e!==r&&console.warn("vsRepeat: size mismatch. Expected size "+e+"px whereas actual size is "+r+"px. Fix vsSize on element:",g[0])})});var d=n-R.offsetBefore-i;l=_slicedToArray(P(m.vsRepeat.sizesCumulative,d-R.scrollMargin),1)[0],l=Math.max(l,0),c=_slicedToArray(P(m.vsRepeat.sizesCumulative,d+R.scrollMargin+r,l),2)[1],c=Math.min(c,x)}M=Math.min(l,M),_=Math.max(c,_),m.vsRepeat.startIndex=R.latch?M:l,m.vsRepeat.endIndex=R.latch?_:c,_<m.vsRepeat.startIndex&&(m.vsRepeat.startIndex=_);var u=!1;if(null==A?u=!0:null==C&&(u=!0),u||(R.hunked?Math.abs(m.vsRepeat.startIndex-A)>=R.hunkSize||0===m.vsRepeat.startIndex&&0!==A?u=!0:(Math.abs(m.vsRepeat.endIndex-C)>=R.hunkSize||m.vsRepeat.endIndex===x&&C!==x)&&(u=!0):u=m.vsRepeat.startIndex!==A||m.vsRepeat.endIndex!==C),u){var p;m[q]=z.slice(m.vsRepeat.startIndex,m.vsRepeat.endIndex),m.$emit("vsRepeatInnerCollectionUpdated",m.vsRepeat.startIndex,m.vsRepeat.endIndex,A,C),R.scrolledToEnd&&(p=z.length-R.scrolledToEndOffset,(m.vsRepeat.endIndex>=p&&C<p||z.length&&m.vsRepeat.endIndex===z.length)&&m.$eval(R.scrolledToEnd)),R.scrolledToBeginning&&(p=R.scrolledToBeginningOffset,m.vsRepeat.startIndex<=p&&A>m.vsRepeat.startIndex&&m.$eval(R.scrolledToBeginning)),A=m.vsRepeat.startIndex,C=m.vsRepeat.endIndex;var v=m.vsRepeat.sizesCumulative[m.vsRepeat.startIndex]+R.offsetBefore,f=m.vsRepeat.sizesCumulative[m.vsRepeat.startIndex+m[q].length]+R.offsetBefore,h=m.vsRepeat.totalSize;b.css(B(v+"px")),I.css(B(h-f+"px"))}return u}R.horizontal?(b.css("height","100%"),I.css("height","100%")):(b.css("width","100%"),I.css("width","100%")),e.vsRepeatOptions&&m.$watchCollection(e.vsRepeatOptions,function(e){var t=_extends({},R,e);JSON.stringify(t)!==JSON.stringify(R)&&(Object.assign(R,e),n(R),h())}),m.$watchCollection(N,function(){var e=0<arguments.length&&void 0!==arguments[0]?arguments[0]:[];z=e,d()}),r.eq(0).attr(H,j+" in "+q+(D?" "+D:"")),r.addClass("vs-repeat-repeated-element"),y.append(b),y.append(r),F(r)(m),y.append(I),m.vsRepeat.startIndex=0,m.vsRepeat.endIndex=0,w.on("scroll",v),U.element(Y).on("resize",f),m.$on("$destroy",function(){U.element(Y).off("resize",f),w.off("scroll",v)}),m.$on("vsRepeatTrigger",d),m.$on("vsRepeatResize",function(){$=!0,p()}),m.$on("vsRenderAll",function(){R.latch&&(m.vsRepeat.endIndex!==x?setTimeout(function(){var e=x;_=Math.max(e,_),m.vsRepeat.endIndex=R.latch?_:e,m[q]=z.slice(m.vsRepeat.startIndex,m.vsRepeat.endIndex),C=m.vsRepeat.endIndex,b.css(B(0)),I.css(B(0)),m.$emit("vsRenderAllDone"),m.$root&&Q(m)}):m.$emit("vsRenderAllDone"))}),m.$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\n      .vs-repeat-before-content,\n      .vs-repeat-after-content {\n        border: none !important;\n        padding: 0 !important;\n      }\n    </style>'),"undefined"!=typeof module&&module.exports&&(module.exports=e.name)}(window,window.angular);
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 57e4ebb..a8ed288 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -909,6 +909,16 @@
         }
       }
     },
+    "JSONStream": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz",
+      "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=",
+      "dev": true,
+      "requires": {
+        "jsonparse": "1.3.1",
+        "through": "2.3.8"
+      }
+    },
     "accepts": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
@@ -1625,9 +1635,9 @@
       "integrity": "sha512-Q4Rvn7P6ObyWfc4stqLWHtG1MJ8vVtjgT24Zbu+8UTzxYuZouqZsmNRRTFVMY/Ux0eIKv1d+JWzsInTX+fdHPQ==",
       "dev": true,
       "requires": {
+        "JSONStream": "1.3.2",
         "combine-source-map": "0.8.0",
         "defined": "1.0.0",
-        "JSONStream": "1.3.2",
         "safe-buffer": "5.1.1",
         "through2": "2.0.3",
         "umd": "3.0.2"
@@ -1662,6 +1672,7 @@
       "integrity": "sha512-gKfOsNQv/toWz+60nSPfYzuwSEdzvV2WdxrVPUbPD/qui44rAkB3t3muNtmmGYHqrG56FGwX9SUEQmzNLAeS7g==",
       "dev": true,
       "requires": {
+        "JSONStream": "1.3.2",
         "assert": "1.4.1",
         "browser-pack": "6.0.4",
         "browser-resolve": "1.11.2",
@@ -1683,7 +1694,6 @@
         "https-browserify": "1.0.0",
         "inherits": "2.0.3",
         "insert-module-globals": "7.0.2",
-        "JSONStream": "1.3.2",
         "labeled-stream-splicer": "2.0.0",
         "module-deps": "4.1.1",
         "os-browserify": "0.3.0",
@@ -4762,14 +4772,6 @@
             }
           }
         },
-        "string_decoder": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
@@ -4780,6 +4782,14 @@
             "strip-ansi": "3.0.1"
           }
         },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
         "stringstream": {
           "version": "0.0.5",
           "bundled": true,
@@ -5970,10 +5980,10 @@
       "integrity": "sha512-p3s7g96Nm62MbHRuj9ZXab0DuJNWD7qcmdUXCOQ/ZZn42DtDXfsLill7bq19lDCx3K3StypqUnuE3H2VmIJFUw==",
       "dev": true,
       "requires": {
+        "JSONStream": "1.3.2",
         "combine-source-map": "0.7.2",
         "concat-stream": "1.5.2",
         "is-buffer": "1.1.6",
-        "JSONStream": "1.3.2",
         "lexical-scope": "1.2.0",
         "process": "0.11.10",
         "through2": "2.0.3",
@@ -6468,16 +6478,6 @@
       "dev": true,
       "optional": true
     },
-    "JSONStream": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz",
-      "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=",
-      "dev": true,
-      "requires": {
-        "jsonparse": "1.3.1",
-        "through": "2.3.8"
-      }
-    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -7408,6 +7408,7 @@
       "integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=",
       "dev": true,
       "requires": {
+        "JSONStream": "1.3.2",
         "browser-resolve": "1.11.2",
         "cached-path-relative": "1.0.1",
         "concat-stream": "1.5.2",
@@ -7415,7 +7416,6 @@
         "detective": "4.7.1",
         "duplexer2": "0.1.4",
         "inherits": "2.0.3",
-        "JSONStream": "1.3.2",
         "parents": "1.0.1",
         "readable-stream": "2.3.5",
         "resolve": "1.5.0",
@@ -9803,12 +9803,6 @@
         }
       }
     },
-    "string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
     "string-width": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -9836,6 +9830,12 @@
         }
       }
     },
+    "string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
diff --git a/src/angular-vs-repeat.js b/src/angular-vs-repeat.js
index dc0fa9c..de59412 100644
--- a/src/angular-vs-repeat.js
+++ b/src/angular-vs-repeat.js
@@ -166,6 +166,13 @@
     printDeprecationWarning($element, `${attrname} attribute is deprecated. Pass the options object to vs-repeat attribute instead https://github.com/kamilkp/angular-vs-repeat#options`);
   }
 
+  function safeDigest(scope) {
+    const phase = scope.$root.$$phase;
+    if (phase !== "$apply" && phase !== "$digest") {
+      scope.$digest();
+    }
+  }
+
   const defaultOptions = {
     latch: false,
     preserveLatchOnRefresh: false,
@@ -377,8 +384,8 @@
                       _mapSize(measuredSize);
                       reinitialize();
                       autosizingRequired = false;
-                      if ($scope.$root && !$scope.$root.$$phase) {
-                        $scope.$digest();
+                      if ($scope.$root) {
+                        safeDigest($scope);
                       }
                     }
                   } else {
@@ -416,7 +423,7 @@
             function scrollHandler() {
               const pos = $scrollParent[0][scrollPos];
               if (updateInnerCollection()) {
-                $scope.$digest();
+                safeDigest($scope);
 
                 if (options._ensureScrollIntegrity) {
                   $scrollParent[0][scrollPos] = pos;
@@ -430,13 +437,13 @@
               if (options.autoresize) {
                 autosizingRequired = true;
                 getFromMeasured();
-                if ($scope.$root && !$scope.$root.$$phase) {
-                  $scope.$digest();
+                if ($scope.$root) {
+                  safeDigest($scope);
                 }
               }
 
               if (updateInnerCollection()) {
-                $scope.$digest();
+                safeDigest($scope);
               }
             }
 
@@ -482,8 +489,8 @@
                 $afterContent.css(getLayoutProps(0));
 
                 $scope.$emit('vsRenderAllDone');
-                if ($scope.$root && !$scope.$root.$$phase) {
-                  $scope.$digest();
+                if ($scope.$root) {
+                  safeDigest($scope);
                 }
               });
             });
@@ -512,8 +519,8 @@
               const ch = getClientSize($scrollParent[0], clientSize);
               if (ch !== _prevClientSize) {
                 reinitialize();
-                if ($scope.$root && !$scope.$root.$$phase) {
-                  $scope.$digest();
+                if ($scope.$root) {
+                  safeDigest($scope);
                 }
               }
               _prevClientSize = ch;