diff --git a/background.js b/background.js
index 4bc9cb4..b77c013 100644
--- a/background.js
+++ b/background.js
@@ -82,7 +82,8 @@ chrome.webRequest.onBeforeRequest.addListener(details=>{
 		return{redirectUrl:chrome.extension.getURL("/html/blocked.html")}
 },{urls:getIPLoggerPatterns()},["blocking"])
 chrome.webRequest.onBeforeRequest.addListener(details=>{
-	return{redirectUrl:decodeURIComponent(details.url.split("?link=")[1])}
+	if(details.method=="GET"&&details.type=="main_frame")
+		return{redirectUrl:decodeURIComponent(details.url.split("?link=")[1])}
 },{urls:["*://*.spaste.com/r/*?link=*"]},["blocking"])
 function getIPLoggerPatterns()
 {
diff --git a/content_script.js b/content_script.js
index cbf0963..51a3222 100644
--- a/content_script.js
+++ b/content_script.js
@@ -117,37 +117,36 @@ if(document instanceof HTMLDocument)
 		ODP(this,"ysmm",//Adf.ly
 		{
 			set:r=>{
-				let I=X=""
-				for(let m=0;m<r.length;m++)
+				let a,m,I="",X=""
+				for(m=0;m<r.length;m++)
 					if(m%2==0)I+=r.charAt(m);else X=r.charAt(m)+X
 				r=I+X
-				let U=r.split("")
-				for(m=0;m<U.length;m++)
+				a=r.split("")
+				for(m=0;m<a.length;m++)
 				{
-					if(!isNaN(U[m]))
+					if(!isNaN(a[m]))
 					{
-						for(let R=m+1;R<U.length;R++)
+						for(var R=m+1;R<a.length;R++)
 						{
-							if(!isNaN(U[R]))
+							if(!isNaN(a[R]))
 							{
-								let S=U[m]^U[R];
-								if(S<10)
-									U[m]=S
+								let S=a[m]^a[R]
+								if(S<10)a[m]=S
 								m=R
-								R=U.length
-							}
-							r=U.join("")
-							r=atob(r)
-							r=r.substring(r.length-(r.length-16))
-							r=r.substring(0,r.length-16)
-							if(r&&(r.indexOf("http://")==0||r.indexOf("https://")==0)&&encodeURI(r)==r)
-							{
-								showNotification(msgs.timerSkip)
-								safelyNavigate(r)
+								R=a.length
 							}
 						}
 					}
 				}
+				r=a.join('')
+				r=window.atob(r)
+				r=r.substring(r.length-(r.length-16))
+				r=r.substring(0,r.length-16)
+				if(r&&(r.indexOf("http://")===0||r.indexOf("https://")===0))
+				{
+					showNotification(msgs.timerSkip)
+					safelyNavigate(r)
+				}
 			}
 		})
 		//LinkBucks
diff --git a/manifest.json b/manifest.json
index a1d3b72..191ce3b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -10,7 +10,7 @@
 	"name": "Universal Bypass",
 	"description": "__MSG_appDesc__",
 	"homepage_url": "https://universal-bypass.org/",
-	"version": "5.8",
+	"version": "5.8.1",
 	"author": "timmyRS",
 	"minimum_chrome_version": "41",
 	"options_ui": {