diff --git a/README.md b/README.md
index 9441587..77bd8aa 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![Build Status](https://travis-ci.com/style-tools/lazy.svg?branch=master)](https://travis-ci.com/style-tools/lazy) [![Version](https://img.shields.io/github/release/style-tools/lazy.svg)](https://github.com/style-tools/lazy/releases) [![npm version](https://badge.fury.io/js/%40style.tools%2Flazy.svg)](http://badge.fury.io/js/%40style.tools%2Flazy) [![Latest Stable Version](https://poser.pugx.org/styletools/lazy/v/stable.png)](https://packagist.org/packages/styletools/lazy)
 
-# Lazy Image and Iframe Loader
+# Lazy Loader
 
 A lightweight lazy loader based on [Intersection Observer V2](https://developers.google.com/web/updates/2019/02/intersectionobserver-v2) with a tiny fallback for old browsers. 
 
@@ -10,7 +10,7 @@ A lightweight lazy loader based on [Intersection Observer V2](https://developers
 - `.webp` rewrite with fallback (WebP support for `<img>` tag, saves a server-side redirect)
 - `inview` and `out-of-view` callback (persistent observer for advanced element-in-view usage)
 - `$lazybg` for lazy loading of `background-image` in stylesheets (CSS-variables)
-- tiniest lazy load script `$z()` (300 bytes).
+- tiniest lazy load script `$z()` (300 bytes)
 
 #### Examples
 
diff --git a/dist/lazy+data-attr+polyfill+events.js b/dist/lazy+data-attr+polyfill+events.js
index 0c8bf54..014a23f 100644
--- a/dist/lazy+data-attr+polyfill+events.js
+++ b/dist/lazy+data-attr+polyfill+events.js
@@ -1,4 +1,4 @@
-(function(b,r,t){function e(c,a,d){c&&"string"!=typeof c&&(c instanceof Array||c.selector)||(c=[c]);var f=c[0]||c.selector||"[data-src]",b=c[1]||c.threshold||c.observer,e=c[2]||c.rootMargin,g;b="object"==typeof b?b:{rootMargin:e||"0px",threshold:b||0};c=c[4]||c.a||["click","mouseover"];if(a instanceof Array){var l=a[2];var p=a[1];a=a[0];p=p||a}a=a||function(a,c,d){d=a.getAttribute("data-srcset");c=a.getAttribute("data-src");d&&(a.srcset=d,a.removeAttribute("data-srcset"));c&&(a.src=c,a.removeAttribute("data-src"));
-l&&l(a)};d=d||function(c,d){for(var b,e,f=0,g=c.length;f<g;f++)if(b=c[f],(e=(d=d===b)||!h||b.isIntersecting)||p)b=!d&&h?b.target:b,e=(e?a:p)(b,h,e),h&&!1!==e&&h.unobserve(b)};"string"==typeof f?g=r.querySelectorAll(f):g=f&&f.length==t?[f]:f;if(-1===a)return g;var h=m?new m(d,b):!1;f=0;for(b=g.length;f<b;f++){var k=g[f];h?h.observe(k):d([k]);var n=function(a){k.removeEventListener(a.type,n);d([k],k)};e=0;for(var q=c.length;e<q;e++)k.addEventListener(c[e],n,{passive:!0,once:!0})}return g}function u(a){n.push([].slice.call(arguments));
-return q(a,-1)}var m,d="IntersectionObserverEntry"in b?b.IntersectionObserverEntry.prototype:0;d&&"intersectionRatio"in d&&"isIntersecting"in d&&(m=b.IntersectionObserver);b.$lazy=e;var a;d=r.currentScript||r.querySelectorAll("script[data-l]")[0];var n=[];if(!m&&(b.$lazypoly?a=b.$lazypoly:d&&(a=d.getAttribute("data-poly")),a)){var q=e;b.$lazy=e=u;"function"==typeof a&&(a=a());("string"!=typeof a&&"then"in a?a:$async.js(a)).then(function(){m=b.IntersectionObserver;b.$lazy=e=q;for(var a;a=n.shift();)e.apply(null,
-a)})}if(d){(a=d.getAttribute("data-l"))&&0===a.indexOf("||")?a=a.split("||"):a=[a];d=0;for(var v=a.length;d<v;d++){try{var l=JSON.parse(a[d])}catch(c){l=!1}l?e(l):e()}}})(window,document);
+(function(b,p,q){function e(c,a,d){c&&"string"!=typeof c&&(c instanceof Array||c.selector)||(c=[c]);var b=c[0]||c.selector||"[data-src]",e=c[1]||c.threshold||c.observer,m=c[2]||c.rootMargin,f;e="object"==typeof e?e:{rootMargin:m||"0px",threshold:e||0};var k=c[4]||c.a||["click","mouseover"];if(a instanceof Array){var l=a[2];var n=a[1];a=a[0];n=n||a}a=a||function(a,c,b){b=a.getAttribute("data-srcset");c=a.getAttribute("data-src");b&&(a.srcset=b,a.removeAttribute("data-srcset"));c&&(a.src=c,a.removeAttribute("data-src"));
+l&&l(a)};d=d||function(c,b){for(var d,e,f=0,r=c.length;f<r;f++)if(d=c[f],(e=(b=b===d)||!g||d.isIntersecting)||n)d=!b&&g?d.target:d,e=(e?a:n)(d,g,e),g&&!1!==e&&g.unobserve(d)};"string"==typeof b?f=p.querySelectorAll(b):f=b&&b.length==q?[b]:b;if(-1===a)return f;var g=h?new h(d,e):!1;c=0;for(b=f.length;c<b;c++)(function(a){function c(b){a.removeEventListener(b.type,c);d([a],a)}g?g.observe(a):d([a]);for(var b=0,e=k.length;b<e;b++)a.addEventListener(k[b],c,{passive:!0,once:!0})})(f[c]);return f}function t(a){k.push([].slice.call(arguments));
+return l(a,-1)}var h,d="IntersectionObserverEntry"in b?b.IntersectionObserverEntry.prototype:0;d&&"intersectionRatio"in d&&"isIntersecting"in d&&(h=b.IntersectionObserver);b.$lazy=e;var a;d=p.currentScript||p.querySelectorAll("script[data-l]")[0];var k=[];if(!h&&(b.$lazypoly?a=b.$lazypoly:d&&(a=d.getAttribute("data-poly")),a)){var l=e;b.$lazy=e=t;"function"==typeof a&&(a=a());("string"!=typeof a&&"then"in a?a:$async.js(a)).then(function(){h=b.IntersectionObserver;b.$lazy=e=l;for(var a;a=k.shift();)e.apply(null,
+a)})}if(d){(a=d.getAttribute("data-l"))&&0===a.indexOf("||")?a=a.split("||"):a=[a];d=0;for(var u=a.length;d<u;d++){try{var m=JSON.parse(a[d])}catch(c){m=!1}m?e(m):e()}}})(window,document);
diff --git a/dist/lazy+webp+data-attr+polyfill+events.js b/dist/lazy+webp+data-attr+polyfill+events.js
index f760b68..ef44af6 100644
--- a/dist/lazy+webp+data-attr+polyfill+events.js
+++ b/dist/lazy+webp+data-attr+polyfill+events.js
@@ -1,5 +1,5 @@
-(function(c,r,z){function k(a,b){return a.getAttribute("data-"+b)}function e(a,b,d){a&&"string"!=typeof a&&(a instanceof Array||a.selector)||(a=[a]);var c=a[0]||a.selector||"[data-src]",e=a[1]||a.threshold||a.observer,f=a[2]||a.rootMargin,l;e="object"==typeof e?e:{rootMargin:f||"0px",threshold:e||0};var t=!1===a[3]||!1===a.b?!1:!0;a=a[4]||a.a||["click","mouseover"];if(b instanceof Array){var h=b[2];var u=b[1];b=b[0];u=u||b}b=b||function(a,b,c){c=k(a,"srcset");b=k(a,"src");c&&(t&&(c=v(c,a)),a.srcset=
-c,a.removeAttribute("data-srcset"));b&&(t&&(b=v(b,a)),a.src=b,a.removeAttribute("data-src"));h&&h(a)};d=d||function(a,c){for(var d,e,f=0,t=a.length;f<t;f++)if(d=a[f],(e=(c=c===d)||!g||d.isIntersecting)||u)d=!c&&g?d.target:d,e=(e?b:u)(d,g,e),g&&!1!==e&&g.unobserve(d)};"string"==typeof c?l=r.querySelectorAll(c):l=c&&c.length==z?[c]:c;if(-1===b)return l;var g=p?new p(d,e):!1;c=0;for(e=l.length;c<e;c++){var m=l[c];g?g.observe(m):d([m]);var n=function(a){m.removeEventListener(a.type,n);d([m],m)};f=0;for(var q=
-a.length;f<q;f++)m.addEventListener(a[f],n,{passive:!0,once:!0})}return l}function A(a){w.push([].slice.call(arguments));return x(a,-1)}var p,d="IntersectionObserverEntry"in c?c.IntersectionObserverEntry.prototype:0;d&&"intersectionRatio"in d&&"isIntersecting"in d&&(p=c.IntersectionObserver);c.$lazy=e;var y,h=new Image;h.onload=h.onerror=function(){y=2==h.height};h.src="data:image/webp;base64,UklGRjoAAABXRUJQVlA4IC4AAACyAgCdASoCAAIALmk0mk0iIiIiIgBoSygABc6WWgAA/veff/0PP8bA//LwYAAA";var n,B=/(\.(jp(e)?g|gif|bmp|png|tiff))/ig;
-var v=function(a,b,c){if(!y)return a;n||(n=k(r.body,"webp")||".webp");if(b&&(c=k(b,"webp"),"no"==c))return a;c=c?c:n;b&&(b.onerror=function(){this.onerror=null;this.src=a});return a.replace(B,c)};c.$zwebp=v;var b;d=r.currentScript||r.querySelectorAll("script[data-l]")[0];var w=[];if(!p&&(c.$lazypoly?b=c.$lazypoly:d&&(b=k(d,"poly")),b)){var x=e;c.$lazy=e=A;"function"==typeof b&&(b=b());("string"!=typeof b&&"then"in b?b:$async.js(b)).then(function(){p=c.IntersectionObserver;c.$lazy=e=x;for(var a;a=
-w.shift();)e.apply(null,a)})}if(d){(b=k(d,"l"))&&0===b.indexOf("||")?b=b.split("||"):b=[b];d=0;for(var C=b.length;d<C;d++){try{var q=JSON.parse(b[d])}catch(a){q=!1}q?e(q):e()}}})(window,document);
+(function(c,p,y){function h(a,b){return a.getAttribute("data-"+b)}function e(a,b,d){a&&"string"!=typeof a&&(a instanceof Array||a.selector)||(a=[a]);var c=a[0]||a.selector||"[data-src]",e=a[1]||a.threshold||a.observer,m=a[2]||a.rootMargin,k;e="object"==typeof e?e:{rootMargin:m||"0px",threshold:e||0};var q=!1===a[3]||!1===a.b?!1:!0;var g=a[4]||a.a||["click","mouseover"];if(b instanceof Array){var l=b[2];var r=b[1];b=b[0];r=r||b}b=b||function(a,b,c){c=h(a,"srcset");b=h(a,"src");c&&(q&&(c=t(c,a)),a.srcset=
+c,a.removeAttribute("data-srcset"));b&&(q&&(b=t(b,a)),a.src=b,a.removeAttribute("data-src"));l&&l(a)};d=d||function(a,c){for(var d,e,m=0,q=a.length;m<q;m++)if(d=a[m],(e=(c=c===d)||!f||d.isIntersecting)||r)d=!c&&f?d.target:d,e=(e?b:r)(d,f,e),f&&!1!==e&&f.unobserve(d)};"string"==typeof c?k=p.querySelectorAll(c):k=c&&c.length==y?[c]:c;if(-1===b)return k;var f=n?new n(d,e):!1;a=0;for(c=k.length;a<c;a++)(function(a){function b(c){a.removeEventListener(c.type,b);d([a],a)}f?f.observe(a):d([a]);for(var c=
+0,e=g.length;c<e;c++)a.addEventListener(g[c],b,{passive:!0,once:!0})})(k[a]);return k}function z(a){v.push([].slice.call(arguments));return w(a,-1)}var n,d="IntersectionObserverEntry"in c?c.IntersectionObserverEntry.prototype:0;d&&"intersectionRatio"in d&&"isIntersecting"in d&&(n=c.IntersectionObserver);c.$lazy=e;var x,g=new Image;g.onload=g.onerror=function(){x=2==g.height};g.src="data:image/webp;base64,UklGRjoAAABXRUJQVlA4IC4AAACyAgCdASoCAAIALmk0mk0iIiIiIgBoSygABc6WWgAA/veff/0PP8bA//LwYAAA";var l,
+A=/(\.(jp(e)?g|gif|bmp|png|tiff))/ig;var t=function(a,b,c){if(!x)return a;l||(l=h(p.body,"webp")||".webp");if(b&&(c=h(b,"webp"),"no"==c))return a;c=c?c:l;b&&(b.onerror=function(){this.onerror=null;this.src=a});return a.replace(A,c)};c.$zwebp=t;var b;d=p.currentScript||p.querySelectorAll("script[data-l]")[0];var v=[];if(!n&&(c.$lazypoly?b=c.$lazypoly:d&&(b=h(d,"poly")),b)){var w=e;c.$lazy=e=z;"function"==typeof b&&(b=b());("string"!=typeof b&&"then"in b?b:$async.js(b)).then(function(){n=c.IntersectionObserver;
+c.$lazy=e=w;for(var a;a=v.shift();)e.apply(null,a)})}if(d){(b=h(d,"l"))&&0===b.indexOf("||")?b=b.split("||"):b=[b];d=0;for(var B=b.length;d<B;d++){try{var u=JSON.parse(b[d])}catch(a){u=!1}u?e(u):e()}}})(window,document);
diff --git a/src/lazy.js b/src/lazy.js
index 078bdab..82e44e1 100644
--- a/src/lazy.js
+++ b/src/lazy.js
@@ -158,30 +158,33 @@ function $lazy(config, inview, observer_callback) {
     // event based fallback
     if (CLICK_EXTENSION) {
         for (var i = 0, l = assets.length; i < l; i++) {
-            asset = assets[i];
-            if (observer) {
-                observer.observe(asset);
-            } else {
-                // simple fallback if Intersection Observer is not available
-                observer_callback([asset]);
-            }
+            (function(asset) {
+                
+                if (observer) {
+                    observer.observe(asset);
+                } else {
+                    // simple fallback if Intersection Observer is not available
+                    observer_callback([asset]);
+                }
 
-            // event listener
-            var listener = function(e) {
+                // event listener
+                var listener = function(e) {
 
-                // remove event
-                asset.removeEventListener(e.type, listener);
-                // call handler
+                    // remove event
+                    asset.removeEventListener(e.type, listener);
+                    // call handler
 
-                observer_callback([asset],asset);
-            };
+                    observer_callback([asset],asset);
+                };
+
+                for (var _i = 0, _l = eventtypes.length; _i < _l; _i++) {
+                    asset.addEventListener(eventtypes[_i], listener, {
+                        "passive": true,
+                        "once": true
+                    });
+                }
+            })(assets[i]);
 
-            for (var _i = 0, _l = eventtypes.length; _i < _l; _i++) {
-                asset.addEventListener(eventtypes[_i], listener, {
-                    "passive": true,
-                    "once": true
-                });
-            }
         }
     } else {