diff --git a/CHANGELOG.md b/CHANGELOG.md
index e351701ae..9371da976 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### v1.8.5.2 
+*2014-07-10*
+
 **ccd0**
 - Fix bugs in gallery's handling of 404ed images.
 
diff --git a/LICENSE b/LICENSE
index dc9e2bf29..c0cf9c5cb 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 /*
-* 4chan X - Version 1.8.5.1 - 2014-07-08
+* 4chan X - Version 1.8.5.2 - 2014-07-10
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 880fcd550..2d9e07001 100644
Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ
diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js
index e6a256e82..e7c5c706b 100644
--- a/builds/4chan-X-beta.meta.js
+++ b/builds/4chan-X-beta.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.8.5.1
+// @version      1.8.5.2
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js
index 1e4855f8f..818a973fe 100644
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
-// @version      1.8.5.1
+// @version      1.8.5.2
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -24,7 +24,7 @@
 // ==/UserScript==
 
 /*
-* 4chan X - Version 1.8.5.1 - 2014-07-08
+* 4chan X - Version 1.8.5.2 - 2014-07-10
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -376,7 +376,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.8.5.1',
+    VERSION: '1.8.5.2',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -7680,7 +7680,7 @@
         title: title
       });
       thumb.dataset.id = Gallery.images.length;
-      thumb.dataset.post = $('a[title="Link to this post"]', post.nodes.info).href;
+      thumb.dataset.post = post.fullID;
       thumbImg = post.file.thumb.cloneNode(false);
       thumbImg.style.cssText = '';
       $.add(thumb, thumbImg);
@@ -7745,9 +7745,11 @@
         file = $.el(elType, {
           title: name.download = name.textContent = this.title
         });
-        $.on(file, 'error', function() {
-          return Gallery.cb.error(file, thumb);
-        });
+        $.on(file, 'error', (function(_this) {
+          return function() {
+            return Gallery.cb.error(file, _this);
+          };
+        })(this));
         file.src = name.href = this.href;
         $.extend(file.dataset, this.dataset);
         if (typeof (_base = nodes.current).pause === "function") {
@@ -7771,11 +7773,8 @@
       },
       error: function(file, thumb) {
         var URL, post, src;
-        post = Get.postFromLink($.el('a', {
-          href: file.dataset.post
-        }));
-        delete post.file.fullImage;
-        src = this.src.split('/');
+        post = g.posts[file.dataset.post];
+        src = file.src.split('/');
         if (src[2] === 'i.4cdn.org') {
           URL = Redirect.to('file', {
             boardID: src[3],
@@ -12507,7 +12506,7 @@
       Settings.dialog = dialog = $.el('div', {
         id: 'fourchanx-settings',
         className: 'dialog',
-        innerHTML: '<nav><div class=sections-list></div><p class=\'imp-exp-result warning\'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href=\'https://github.com/ccd0/4chan-x\' target=_blank>4chan X</a>&nbsp|&nbsp<a href=\'https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md\' target=_blank>1.8.5.1</a>&nbsp|&nbsp<a href=\'https://github.com/ccd0/4chan-x/issues\' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class=\'close fa fa-times\' title=Close></a></div></nav><div class=section-container><section></section></div>'
+        innerHTML: '<nav><div class=sections-list></div><p class=\'imp-exp-result warning\'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href=\'https://github.com/ccd0/4chan-x\' target=_blank>4chan X</a>&nbsp|&nbsp<a href=\'https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md\' target=_blank>1.8.5.2</a>&nbsp|&nbsp<a href=\'https://github.com/ccd0/4chan-x/issues\' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class=\'close fa fa-times\' title=Close></a></div></nav><div class=section-container><section></section></div>'
       });
       $.on($('.export', Settings.dialog), 'click', Settings["export"]);
       $.on($('.import', Settings.dialog), 'click', Settings["import"]);
@@ -13359,7 +13358,7 @@
         }
         if (previousversion) {
           el = $.el('span', {
-            innerHTML: '4chan X has been updated to <a href="https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md" target="_blank">version 1.8.5.1</a>.'
+            innerHTML: '4chan X has been updated to <a href="https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md" target="_blank">version 1.8.5.2</a>.'
           });
           new Notice('info', el, 15);
         } else {
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 9931ac339..924afd37c 100644
Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ
diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js
index 3dce18168..2a0ec3c1f 100644
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
-// @version      1.8.5.1
+// @version      1.8.5.2
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -23,7 +23,7 @@
 // ==/UserScript==
 
 /*
-* 4chan X - Version 1.8.5.1 - 2014-07-08
+* 4chan X - Version 1.8.5.2 - 2014-07-10
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -375,7 +375,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.8.5.1',
+    VERSION: '1.8.5.2',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -7679,7 +7679,7 @@
         title: title
       });
       thumb.dataset.id = Gallery.images.length;
-      thumb.dataset.post = $('a[title="Link to this post"]', post.nodes.info).href;
+      thumb.dataset.post = post.fullID;
       thumbImg = post.file.thumb.cloneNode(false);
       thumbImg.style.cssText = '';
       $.add(thumb, thumbImg);
@@ -7744,9 +7744,11 @@
         file = $.el(elType, {
           title: name.download = name.textContent = this.title
         });
-        $.on(file, 'error', function() {
-          return Gallery.cb.error(file, thumb);
-        });
+        $.on(file, 'error', (function(_this) {
+          return function() {
+            return Gallery.cb.error(file, _this);
+          };
+        })(this));
         file.src = name.href = this.href;
         $.extend(file.dataset, this.dataset);
         if (typeof (_base = nodes.current).pause === "function") {
@@ -7770,11 +7772,8 @@
       },
       error: function(file, thumb) {
         var URL, post, src;
-        post = Get.postFromLink($.el('a', {
-          href: file.dataset.post
-        }));
-        delete post.file.fullImage;
-        src = this.src.split('/');
+        post = g.posts[file.dataset.post];
+        src = file.src.split('/');
         if (src[2] === 'i.4cdn.org') {
           URL = Redirect.to('file', {
             boardID: src[3],
@@ -12506,7 +12505,7 @@
       Settings.dialog = dialog = $.el('div', {
         id: 'fourchanx-settings',
         className: 'dialog',
-        innerHTML: '<nav><div class=sections-list></div><p class=\'imp-exp-result warning\'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href=\'https://github.com/ccd0/4chan-x\' target=_blank>4chan X</a>&nbsp|&nbsp<a href=\'https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md\' target=_blank>1.8.5.1</a>&nbsp|&nbsp<a href=\'https://github.com/ccd0/4chan-x/issues\' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class=\'close fa fa-times\' title=Close></a></div></nav><div class=section-container><section></section></div>'
+        innerHTML: '<nav><div class=sections-list></div><p class=\'imp-exp-result warning\'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href=\'https://github.com/ccd0/4chan-x\' target=_blank>4chan X</a>&nbsp|&nbsp<a href=\'https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md\' target=_blank>1.8.5.2</a>&nbsp|&nbsp<a href=\'https://github.com/ccd0/4chan-x/issues\' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class=\'close fa fa-times\' title=Close></a></div></nav><div class=section-container><section></section></div>'
       });
       $.on($('.export', Settings.dialog), 'click', Settings["export"]);
       $.on($('.import', Settings.dialog), 'click', Settings["import"]);
@@ -13358,7 +13357,7 @@
         }
         if (previousversion) {
           el = $.el('span', {
-            innerHTML: '4chan X has been updated to <a href="https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md" target="_blank">version 1.8.5.1</a>.'
+            innerHTML: '4chan X has been updated to <a href="https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md" target="_blank">version 1.8.5.2</a>.'
           });
           new Notice('info', el, 15);
         } else {
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 3206d63cc..f9ca46613 100644
Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ
diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js
index 4fb67dbe1..21b36e98d 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.8.5.1
+// @version      1.8.5.2
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 41897c758..8292d3047 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
-// @version      1.8.5.1
+// @version      1.8.5.2
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -24,7 +24,7 @@
 // ==/UserScript==
 
 /*
-* 4chan X - Version 1.8.5.1 - 2014-07-08
+* 4chan X - Version 1.8.5.2 - 2014-07-10
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -376,7 +376,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.8.5.1',
+    VERSION: '1.8.5.2',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -7680,7 +7680,7 @@
         title: title
       });
       thumb.dataset.id = Gallery.images.length;
-      thumb.dataset.post = $('a[title="Link to this post"]', post.nodes.info).href;
+      thumb.dataset.post = post.fullID;
       thumbImg = post.file.thumb.cloneNode(false);
       thumbImg.style.cssText = '';
       $.add(thumb, thumbImg);
@@ -7745,9 +7745,11 @@
         file = $.el(elType, {
           title: name.download = name.textContent = this.title
         });
-        $.on(file, 'error', function() {
-          return Gallery.cb.error(file, thumb);
-        });
+        $.on(file, 'error', (function(_this) {
+          return function() {
+            return Gallery.cb.error(file, _this);
+          };
+        })(this));
         file.src = name.href = this.href;
         $.extend(file.dataset, this.dataset);
         if (typeof (_base = nodes.current).pause === "function") {
@@ -7771,11 +7773,8 @@
       },
       error: function(file, thumb) {
         var URL, post, src;
-        post = Get.postFromLink($.el('a', {
-          href: file.dataset.post
-        }));
-        delete post.file.fullImage;
-        src = this.src.split('/');
+        post = g.posts[file.dataset.post];
+        src = file.src.split('/');
         if (src[2] === 'i.4cdn.org') {
           URL = Redirect.to('file', {
             boardID: src[3],
@@ -12507,7 +12506,7 @@
       Settings.dialog = dialog = $.el('div', {
         id: 'fourchanx-settings',
         className: 'dialog',
-        innerHTML: '<nav><div class=sections-list></div><p class=\'imp-exp-result warning\'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href=\'https://github.com/ccd0/4chan-x\' target=_blank>4chan X</a>&nbsp|&nbsp<a href=\'https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md\' target=_blank>1.8.5.1</a>&nbsp|&nbsp<a href=\'https://github.com/ccd0/4chan-x/issues\' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class=\'close fa fa-times\' title=Close></a></div></nav><div class=section-container><section></section></div>'
+        innerHTML: '<nav><div class=sections-list></div><p class=\'imp-exp-result warning\'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href=\'https://github.com/ccd0/4chan-x\' target=_blank>4chan X</a>&nbsp|&nbsp<a href=\'https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md\' target=_blank>1.8.5.2</a>&nbsp|&nbsp<a href=\'https://github.com/ccd0/4chan-x/issues\' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class=\'close fa fa-times\' title=Close></a></div></nav><div class=section-container><section></section></div>'
       });
       $.on($('.export', Settings.dialog), 'click', Settings["export"]);
       $.on($('.import', Settings.dialog), 'click', Settings["import"]);
@@ -13359,7 +13358,7 @@
         }
         if (previousversion) {
           el = $.el('span', {
-            innerHTML: '4chan X has been updated to <a href="https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md" target="_blank">version 1.8.5.1</a>.'
+            innerHTML: '4chan X has been updated to <a href="https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md" target="_blank">version 1.8.5.2</a>.'
           });
           new Notice('info', el, 15);
         } else {
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 8f6ec8a86..bd032f0e1 100644
Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ
diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml
index c843f996f..e7aab8847 100644
--- a/builds/updates-beta.xml
+++ b/builds/updates-beta.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.8.5.1' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.8.5.2' />
   </app>
 </gupdate>
 
diff --git a/builds/updates.xml b/builds/updates.xml
index 494ba6641..103f38c7f 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.8.5.1' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.8.5.2' />
   </app>
 </gupdate>
 
diff --git a/package.json b/package.json
index 278e89e6d..d592304e4 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "4chan-X",
-  "version": "1.8.5.1",
+  "version": "1.8.5.2",
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
   "meta": {
     "name": "4chan X",